Hello community,
here is the log from the commit of package kdegraphics-strigi-analyzer for
openSUSE:Factory checked in at 2012-03-13 09:32:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdegraphics-strigi-analyzer (Old)
and /work/SRC/openSUSE:Factory/.kdegraphics-strigi-analyzer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdegraphics-strigi-analyzer", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer.changes
2012-01-27 15:20:39.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kdegraphics-strigi-analyzer.new/kdegraphics-strigi-analyzer.changes
2012-03-13 09:33:21.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Mar 6 01:26:45 UTC 2012 - stefan.bru...@rwth-aachen.de
+
+- fix tiff analyzer (missing types, wrong datetime format)
+
+-------------------------------------------------------------------
+Fri Mar 2 23:14:12 CET 2012 - dmuel...@suse.de
+
+- update to 4.8.1
+ * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for
details
+
+-------------------------------------------------------------------
Old:
----
4_6_BRANCH.diff
kdegraphics-strigi-analyzer-4.8.0.tar.bz2
New:
----
fix_tiff.diff
kdegraphics-strigi-analyzer-4.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics-strigi-analyzer.spec ++++++
--- /var/tmp/diff_new_pack.KIfaRL/_old 2012-03-13 09:33:23.000000000 +0100
+++ /var/tmp/diff_new_pack.KIfaRL/_new 2012-03-13 09:33:23.000000000 +0100
@@ -15,21 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: kdegraphics-strigi-analyzer
BuildRequires: libkde4-devel
-BuildRequires: libsoprano-devel
BuildRequires: libtiff-devel
-BuildRequires: oxygen-icon-theme-large
-BuildRequires: soprano-backend-redland
BuildRequires: strigi-devel
Summary: Base package for kdegraphics apps
License: LGPL-2.1+
Group: Productivity/Graphics/Other
Url: http://www.kde.org
-Version: 4.8.0
+Version: 4.8.1
Release: 0
Source0: %{name}-%version.tar.bz2
-Patch0: 4_6_BRANCH.diff
+Patch0: fix_tiff.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@@ -39,7 +37,7 @@
%prep
%setup -q -n %{name}-%version
-%patch0
+%patch0 -p1
%build
%cmake_kde4 -d build
++++++ fix_tiff.diff ++++++
diff --git a/tiff/tiffendanalyzer.cpp b/tiff/tiffendanalyzer.cpp
index 77128d8..f995394 100644
--- a/tiff/tiffendanalyzer.cpp
+++ b/tiff/tiffendanalyzer.cpp
@@ -26,6 +26,7 @@
#include <tiffio.h>
#include <cstring>
+#include <time.h>
using namespace Strigi;
@@ -105,6 +106,17 @@ readTiffTagUint16(TIFF* tiff, ttag_t tag, AnalysisResult&
ar, const RegisteredFi
ar.addValue(field, value);
}
+void
+readTiffTagDateTime(TIFF* tiff, ttag_t tag, AnalysisResult& ar, const
RegisteredField* field) {
+ struct tm dt;
+ char* buffer = 0;
+ TIFFGetField(tiff, tag, &buffer);
+ // the tiff datetime string format is as follows: "2005:06:03 17:13:33"
+ if (buffer && (6 == sscanf(buffer, "%d:%d:%d %d:%d:%d",
+ &dt.tm_year, &dt.tm_mon, &dt.tm_mday, &dt.tm_hour, &dt.tm_min,
&dt.tm_sec)) )
+ ar.addValue(field, uint32_t(mktime(&dt)));
+}
+
}
class TiffEndAnalyzerFactory;
@@ -146,37 +158,41 @@ private:
const RegisteredField* bitsPerSampleField;
const RegisteredField* xResolutionField;
const RegisteredField* yResolutionField;
+ const RegisteredField* typeField;
};
#define NS_NFO "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#";
#define NS_NIE "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#";
-#define NS_NEXIF "http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#";
+#define NS_NCO "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#";
+// #define NS_NEXIF
"http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#";
void
TiffEndAnalyzerFactory::registerFields(FieldRegister& r) {
widthField = r.registerField(NS_NFO "width");
heightField = r.registerField(NS_NFO "height");
copyrightField = r.registerField(NS_NIE "copyright");
- descriptionField = r.registerField(NS_NEXIF "imageDescription");
- samplesPerPixelField = r.registerField(NS_NEXIF "samplesPerPixel");
- softwareField = r.registerField(NS_NEXIF "software");
- artistField = r.registerField(NS_NEXIF "artist");
- dateTimeField = r.registerField(NS_NEXIF "dateTime");
- bitsPerSampleField = r.registerField(NS_NEXIF "bitsPerSample");
- xResolutionField = r.registerField(NS_NEXIF "xResolution");
- yResolutionField = r.registerField(NS_NEXIF "yResolution");
+ descriptionField = r.registerField(NS_NIE "description");
+ // there is no appropriate field in NS_NFO/NS_NIE ontologies
+ // samplesPerPixelField = r.registerField(NS_NEXIF "samplesPerPixel");
+ softwareField = r.registerField(NS_NIE "generator");
+ artistField = r.registerField(NS_NCO "creator");
+ dateTimeField = r.registerField(NS_NIE "contentCreated");
+ bitsPerSampleField = r.registerField(NS_NFO "colorDepth");
+ xResolutionField = r.registerField(NS_NFO "horizontalResolution");
+ yResolutionField = r.registerField(NS_NFO "verticalResolution");
+ typeField = r.typeField;
addField(widthField);
addField(heightField);
addField(copyrightField);
addField(descriptionField);
- addField(samplesPerPixelField);
addField(softwareField);
addField(artistField);
addField(dateTimeField);
addField(bitsPerSampleField);
addField(xResolutionField);
addField(yResolutionField);
+ addField(typeField);
}
#undef NS_NFO
@@ -203,15 +219,17 @@ TiffEndAnalyzer::analyze(AnalysisResult& ar, InputStream*
in) {
return -1;
}
+ ar.addValue(factory->typeField,
"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#RasterImage";);
+
// simple fields
readTiffTagUint32(tiff, TIFFTAG_IMAGEWIDTH, ar, factory->widthField);
readTiffTagUint32(tiff, TIFFTAG_IMAGELENGTH, ar, factory->heightField);
readTiffTagString(tiff, TIFFTAG_COPYRIGHT, ar, factory->copyrightField);
readTiffTagString(tiff, TIFFTAG_IMAGEDESCRIPTION, ar,
factory->descriptionField);
- readTiffTagUint16(tiff, TIFFTAG_SAMPLESPERPIXEL, ar,
factory->samplesPerPixelField);
+ // readTiffTagUint16(tiff, TIFFTAG_SAMPLESPERPIXEL, ar,
factory->samplesPerPixelField);
readTiffTagString(tiff, TIFFTAG_SOFTWARE, ar, factory->softwareField);
readTiffTagString(tiff, TIFFTAG_ARTIST, ar, factory->artistField);
- readTiffTagString(tiff, TIFFTAG_DATETIME, ar, factory->dateTimeField);
+ readTiffTagDateTime(tiff, TIFFTAG_DATETIME, ar, factory->dateTimeField);
readTiffTagUint16(tiff, TIFFTAG_BITSPERSAMPLE, ar,
factory->bitsPerSampleField);
// X and Y resolutions
++++++ kdegraphics-strigi-analyzer-4.8.0.tar.bz2 ->
kdegraphics-strigi-analyzer-4.8.1.tar.bz2 ++++++
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
