generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "move the config check from .c to .h"

Browse Source
This commit is contained in:
skal 2013-02-28 12:25:53 -08:00 committed by Gerrit Code Review
commit 72655350ea
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/thread.c
View File

@ -9,10 +9,6 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <assert.h> #include <assert.h>
#include <string.h> // for memset() #include <string.h> // for memset()
#include "./thread.h" #include "./thread.h"

12
src/utils/thread.h
View File

@ -12,6 +12,10 @@
#ifndef WEBP_UTILS_THREAD_H_ #ifndef WEBP_UTILS_THREAD_H_
#define WEBP_UTILS_THREAD_H_ #define WEBP_UTILS_THREAD_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {
#endif #endif
@ -63,13 +67,13 @@ typedef struct {
// Must be called first, before any other method. // Must be called first, before any other method.
void WebPWorkerInit(WebPWorker* const worker); void WebPWorkerInit(WebPWorker* const worker);
// Must be called initialize the object and spawn the thread. Re-entrant. // Must be called to initialize the object and spawn the thread. Re-entrant.
// Will potentially launch the thread. Returns false in case of error. // Will potentially launch the thread. Returns false in case of error.
int WebPWorkerReset(WebPWorker* const worker); int WebPWorkerReset(WebPWorker* const worker);
// Make sure the previous work is finished. Returns true if worker->had_error // Makes sure the previous work is finished. Returns true if worker->had_error
// was not set and not error condition was triggered by the working thread. // was not set and no error condition was triggered by the working thread.
int WebPWorkerSync(WebPWorker* const worker); int WebPWorkerSync(WebPWorker* const worker);
// Trigger the thread to call hook() with data1 and data2 argument. These // Triggers the thread to call hook() with data1 and data2 argument. These
// hook/data1/data2 can be changed at any time before calling this function, // hook/data1/data2 can be changed at any time before calling this function,
// but not be changed afterward until the next call to WebPWorkerSync(). // but not be changed afterward until the next call to WebPWorkerSync().
void WebPWorkerLaunch(WebPWorker* const worker); void WebPWorkerLaunch(WebPWorker* const worker);