[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdesupport/strigi/src/streamanalyzer
From: Sebastian Trueg <sebastian () trueg ! de>
Date: 2010-02-12 9:06:12
Message-ID: 1265965572.598792.29736.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1089039 by trueg:
Fixed namespace of nfo:colorDepth
M +1 -1 endanalyzers/bmpendanalyzer.cpp
M +1 -1 endanalyzers/mpegendanalyzer.cpp
M +2 -2 endanalyzers/pngendanalyzer.cpp
M +5 -5 throughplugins/ddsthroughanalyzer.cpp
M +4 -4 throughplugins/icothroughanalyzer.cpp
M +3 -3 throughplugins/pcxthroughanalyzer.cpp
M +2 -2 throughplugins/rgbthroughanalyzer.cpp
M +1 -1 throughplugins/tgathroughanalyzer.cpp
--- trunk/kdesupport/strigi/src/streamanalyzer/endanalyzers/bmpendanalyzer.cpp #1089038:1089039
@@ -38,7 +38,7 @@
heightField = reg.registerField(
"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#height");
colorDepthField = reg.registerField(
- "http://www.semanticdesktop.org/ontologies/nfo#colorDepth");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorDepth");
rdftypeField = reg.typeField;
addField(typeField);
--- trunk/kdesupport/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.cpp #1089038:1089039
@@ -33,7 +33,7 @@
const string
videoClassName(
- NMM_DRAFT "Video");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Video");
void MpegEndAnalyzerFactory::registerFields(FieldRegister& r) {
fields["length"] = r.registerField(
--- trunk/kdesupport/strigi/src/streamanalyzer/endanalyzers/pngendanalyzer.cpp #1089038:1089039
@@ -66,7 +66,7 @@
heightField = reg.registerField(
"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#height");
colorDepthField = reg.registerField(
- "http://www.semanticdesktop.org/ontologies/nfo#colorDepth");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorDepth");
colorModeField = reg.registerField(
"http://freedesktop.org/standards/xesam/1.0/core#colorSpace");
compressionField = reg.registerField(
@@ -337,7 +337,7 @@
as.addValue(factory->titleField, value);
} else if ("Author" == key) {
string authorUri = as.newAnonymousUri();
-
+
as.addValue(factory->authorField, authorUri);
as.addTriplet(authorUri, typeFieldName, contactClassName);
as.addTriplet(authorUri, fullnameFieldName, value);
--- trunk/kdesupport/strigi/src/streamanalyzer/throughplugins/ddsthroughanalyzer.cpp #1089038:1089039
@@ -132,7 +132,7 @@
readPixelFormat ( InputStream* in, DDSPixelFormat & pf )
{
const char* c;
-
+
if (4 != in->read(c, 4, 4))
return false;
pf.size = readLittleEndianUInt32(c);
@@ -191,7 +191,7 @@
return true;
}
-
+
bool
readHeader(InputStream* in, DDSHeader& header)
{
@@ -233,8 +233,8 @@
if (!readPixelFormat( in, header.pf))
return false;
-
+
if (!readCaps ( in, header.caps))
return false;
@@ -257,7 +257,7 @@
"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#height");
volumeDepthField = reg.registerField( "http://strigi.sf.net/ontologies/homeless#ddsVolumeDepth");
bitDepthField = reg.registerField(
- "http://www.semanticdesktop.org/ontologies/nfo#colorDepth");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorDepth");
mipmapCountField = reg.registerField("http://strigi.sf.net/ontologies/homeless#ddsMipmapCount");
typeField = reg.registerField("http://strigi.sf.net/ontologies/homeless#ddsImageType");
colorModeField = reg.registerField(
@@ -290,7 +290,7 @@
//Remember: dds files are little-endian
//read the beginning of the stream and make sure it looks ok
-
+
if (4 != in->read(c, 4, 4)) {
in->reset(0); // rewind to the start of the stream
return in;
--- trunk/kdesupport/strigi/src/streamanalyzer/throughplugins/icothroughanalyzer.cpp #1089038:1089039
@@ -41,7 +41,7 @@
numberField = reg.registerField(
"http://strigi.sf.net/ontologies/homeless#documentImageCount");
bitsPerPixelField = reg.registerField(
- "http://www.semanticdesktop.org/ontologies/nfo#colorDepth");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorDepth");
colorCountField = reg.registerField(
"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorCount");
@@ -65,10 +65,10 @@
const char *c;
int32_t n;
-
+
// Remember: ICO files are little-endian
// read the beginning of the stream and make sure it looks ok
-
+
n = in->read(c, 6, 6);
if (n != 6) {
in->reset(0); // rewind to the start of the stream
@@ -154,7 +154,7 @@
analysisResult->addValue( factory->colorCountField, icoe_colorcount );
else if (icoe_bitcount > 0)
analysisResult->addValue( factory->colorCountField, 2 ^ icoe_bitcount );
-
+
in->reset(0); // rewind to the start of the stream
return in;
}
--- trunk/kdesupport/strigi/src/streamanalyzer/throughplugins/pcxthroughanalyzer.cpp #1089038:1089039
@@ -41,7 +41,7 @@
vResolutionField = reg.registerField(
"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#verticalResolution");
colorDepthField = reg.registerField(
- "http://www.semanticdesktop.org/ontologies/nfo#colorDepth");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorDepth");
typeField = reg.typeField;
addField(compressionField);
@@ -70,11 +70,11 @@
in->reset(0);
if (nread < nreq) return in;
// check header for some magic bytes and determine if it is valid pcx file
- if (header[0]!=10 || header[1]>5 || header[1]==1 || header[2]>1 ||
+ if (header[0]!=10 || header[1]>5 || header[1]==1 || header[2]>1 ||
header[3]>8 || header[3]==3 || (header[3]>4 && header[3]<8) || header[64]!=0) return in;
// header should be padded to 128 bytes with zeros
for (int i=74;i<128;i++) if (header[i]!=0) return in;
-
+
int w = ( readLittleEndianUInt16(header+8)-readLittleEndianUInt16(header+4) ) + 1;
int h = ( readLittleEndianUInt16(header+10)-readLittleEndianUInt16(header+6) ) + 1;
int bpp = header[3]*header[65];
--- trunk/kdesupport/strigi/src/streamanalyzer/throughplugins/rgbthroughanalyzer.cpp #1089038:1089039
@@ -44,7 +44,7 @@
heightField = reg.registerField(
"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#height");
bitDepthField = reg.registerField(
- "http://www.semanticdesktop.org/ontologies/nfo#colorDepth");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorDepth");
imageNameField = reg.registerField(
"http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title");
sharedRowsField = reg.registerField(
@@ -111,7 +111,7 @@
if (dimension == 1)
ysize = 1;
- // report analysis
+ // report analysis
analysisResult->addValue( factory->widthField, xsize );
analysisResult->addValue( factory->heightField, ysize );
analysisResult->addValue( factory->bitDepthField, zsize * 8 * bpc );
--- trunk/kdesupport/strigi/src/streamanalyzer/throughplugins/tgathroughanalyzer.cpp #1089038:1089039
@@ -34,7 +34,7 @@
compressionField = reg.registerField(
"http://freedesktop.org/standards/xesam/1.0/core#compressionAlgorithm");
colorDepthField = reg.registerField(
- "http://www.semanticdesktop.org/ontologies/nfo#colorDepth");
+ "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#colorDepth");
colorModeField = reg.registerField(
"http://freedesktop.org/standards/xesam/1.0/core#colorSpace");
widthField = reg.registerField(
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic