[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7850 - Extractor/src/plugins
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7850 - Extractor/src/plugins |
Date: |
Tue, 4 Nov 2008 13:26:43 -0700 (MST) |
Author: durner
Date: 2008-11-04 13:26:43 -0700 (Tue, 04 Nov 2008)
New Revision: 7850
Modified:
Extractor/src/plugins/Makefile.am
Extractor/src/plugins/thumbnailextractorqt.cc
Log:
link & include pthreads
Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am 2008-11-04 19:15:10 UTC (rev 7849)
+++ Extractor/src/plugins/Makefile.am 2008-11-04 20:26:43 UTC (rev 7850)
@@ -22,7 +22,7 @@
if HAVE_QT
thumbqt=libextractor_thumbnailqt.la
- qtflags=-lQtGui -lQtCore
+ qtflags=-lQtGui -lQtCore -lpthread
else
if HAVE_QT4
thumbqt=libextractor_thumbnailqt.la
Modified: Extractor/src/plugins/thumbnailextractorqt.cc
===================================================================
--- Extractor/src/plugins/thumbnailextractorqt.cc 2008-11-04 19:15:10 UTC
(rev 7849)
+++ Extractor/src/plugins/thumbnailextractorqt.cc 2008-11-04 20:26:43 UTC
(rev 7850)
@@ -31,6 +31,7 @@
#include <Qt/qbytearray.h>
#include <Qt/qbuffer.h>
#include <Qt/qapplication.h>
+#include <pthread.h>
#ifdef HAVE_QT_SVG
#include <Qt/qsvgrenderer.h>
@@ -80,7 +81,7 @@
NULL
};
-static struct EXTRACTOR_Keywords *
+static struct EXTRACTOR_Keywords *
extract(const unsigned char * data,
size_t size,
struct EXTRACTOR_Keywords * prev,
@@ -233,7 +234,7 @@
x->options);
}
-struct EXTRACTOR_Keywords *
+struct EXTRACTOR_Keywords *
libextractor_thumbnailqt_extract(const char * filename,
const unsigned char * data,
size_t size,
@@ -250,11 +251,11 @@
if (0 == pthread_create(&pt, NULL, &run, &cls))
if (0 == pthread_join(pt, &ret))
return (struct EXTRACTOR_Keywords*) ret;
- return prev;
+ return prev;
}
-struct EXTRACTOR_Keywords *
+struct EXTRACTOR_Keywords *
libextractor_thumbnail_extract(const char * filename,
const unsigned char * data,
size_t size,
@@ -263,7 +264,7 @@
return libextractor_thumbnailqt_extract(filename,
data,
size,
- prev,
+ prev,
options);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7850 - Extractor/src/plugins,
gnunet <=