|
 |
ee4fba |
From 35cf4a4818a0d1bc7cda07e29f271360e06443a0 Mon Sep 17 00:00:00 2001
|
|
|
ee4fba |
From: Weng Xuetian <wengxt@gmail.com>
|
|
|
ee4fba |
Date: Mon, 12 Dec 2011 09:12:35 +0000
|
|
|
ee4fba |
Subject: [PATCH 1/8] Fix xpm and xbm index.
|
|
|
ee4fba |
|
|
|
ee4fba |
REVIEW: 103368
|
|
|
ee4fba |
---
|
|
|
ee4fba |
plugins/lineplugins/xpmlineanalyzer.cpp | 10 +++++-----
|
|
|
ee4fba |
plugins/throughplugins/xbmthroughanalyzer.cpp | 2 +-
|
|
|
ee4fba |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
ee4fba |
|
|
|
ee4fba |
diff --git a/plugins/lineplugins/xpmlineanalyzer.cpp b/plugins/lineplugins/xpmlineanalyzer.cpp
|
|
|
ee4fba |
index 980b2f7..c87a071 100644
|
|
|
ee4fba |
--- a/plugins/lineplugins/xpmlineanalyzer.cpp
|
|
|
ee4fba |
+++ b/plugins/lineplugins/xpmlineanalyzer.cpp
|
|
|
ee4fba |
@@ -65,7 +65,7 @@ XpmLineAnalyzer::handleLine(const char* data, uint32_t length) {
|
|
|
ee4fba |
uint32_t i = 0;
|
|
|
ee4fba |
// we have found the line which should contain the information we want
|
|
|
ee4fba |
ready = true;
|
|
|
ee4fba |
- // read the height
|
|
|
ee4fba |
+ // read the width
|
|
|
ee4fba |
uint32_t propertyValue = 0;
|
|
|
ee4fba |
i++;
|
|
|
ee4fba |
while (i < length && isdigit(data[i])) {
|
|
|
ee4fba |
@@ -76,9 +76,9 @@ XpmLineAnalyzer::handleLine(const char* data, uint32_t length) {
|
|
|
ee4fba |
if (i >= length || data[i] != ' ')
|
|
|
ee4fba |
return;
|
|
|
ee4fba |
|
|
|
ee4fba |
- analysisResult->addValue(factory->heightField, propertyValue);
|
|
|
ee4fba |
+ analysisResult->addValue(factory->widthField, propertyValue);
|
|
|
ee4fba |
|
|
|
ee4fba |
- // read the width
|
|
|
ee4fba |
+ // read the height
|
|
|
ee4fba |
propertyValue = 0;
|
|
|
ee4fba |
i++;
|
|
|
ee4fba |
while (i < length && isdigit(data[i])) {
|
|
|
ee4fba |
@@ -89,7 +89,7 @@ XpmLineAnalyzer::handleLine(const char* data, uint32_t length) {
|
|
|
ee4fba |
if (i >= length || data[i] != ' ')
|
|
|
ee4fba |
return;
|
|
|
ee4fba |
|
|
|
ee4fba |
- analysisResult->addValue(factory->widthField, propertyValue);
|
|
|
ee4fba |
+ analysisResult->addValue(factory->heightField, propertyValue);
|
|
|
ee4fba |
|
|
|
ee4fba |
// read the number of colors
|
|
|
ee4fba |
propertyValue = 0;
|
|
|
ee4fba |
@@ -103,7 +103,7 @@ XpmLineAnalyzer::handleLine(const char* data, uint32_t length) {
|
|
|
ee4fba |
return;
|
|
|
ee4fba |
|
|
|
ee4fba |
analysisResult->addValue(factory->numberOfColorsField, propertyValue);
|
|
|
ee4fba |
- analysisResult->addValue(factory->typeField, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Image");
|
|
|
ee4fba |
+ analysisResult->addValue(factory->typeField, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#RasterImage");
|
|
|
ee4fba |
}
|
|
|
ee4fba |
bool
|
|
|
ee4fba |
XpmLineAnalyzer::isReadyWithStream() {
|
|
|
ee4fba |
diff --git a/plugins/throughplugins/xbmthroughanalyzer.cpp b/plugins/throughplugins/xbmthroughanalyzer.cpp
|
|
|
ee4fba |
index e926e84..e3f35cc 100644
|
|
|
ee4fba |
--- a/plugins/throughplugins/xbmthroughanalyzer.cpp
|
|
|
ee4fba |
+++ b/plugins/throughplugins/xbmthroughanalyzer.cpp
|
|
|
ee4fba |
@@ -145,7 +145,7 @@ XbmThroughAnalyzer::connectInputStream(InputStream* in) {
|
|
|
ee4fba |
}
|
|
|
ee4fba |
}
|
|
|
ee4fba |
|
|
|
ee4fba |
- analysisResult->addValue(factory->typeField, "http://www.semanticdesktop.org/ontologies/nfo#Cursor");
|
|
|
ee4fba |
+ analysisResult->addValue(factory->typeField, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Cursor");
|
|
|
ee4fba |
|
|
|
ee4fba |
return in;
|
|
|
ee4fba |
}
|
|
|
ee4fba |
--
|
|
|
ee4fba |
1.7.10.4
|
|
|
ee4fba |
|