Bugfixes

viaacode · Jun 28, 2016 · fe40ee6 · fe40ee6
1 parent af9a78c
commit fe40ee6
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 21 deletions.
diff --git a/dpf_manager.iml b/dpf_manager.iml
@@ -123,7 +123,8 @@
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.8.11.2" level="project" />
+    <orderEntry type="library" name="Maven: com.h2database:h2:1.4.192" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.0.CR7" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.4" level="project" />
   </component>
 </module>
diff --git a/package/linux/DPFManager.old.spec b/package/linux/DPFManager.old.spec
@@ -1,6 +1,6 @@
 Summary: DPF Manager
 Name: dpf-manager
-Version: 2.2
+Version: 2.3
 Release: 1
 License: Unknown
 Vendor: DPF Manager
@@ -69,4 +69,4 @@ fi
 
 rm /usr/bin/dpf-manager
 
-%clean
+%clean
diff --git a/package/windows/DPF Manager.iss b/package/windows/DPF Manager.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{0D5B5F16-9992-49DC-AD65-D66FE249CE67}
 AppName=DPF Manager
-AppVersion=2.2
+AppVersion=2.3
 AppVerName=DPF Manager {#SetupSetting("AppVersion")}
 AppPublisher=DPF Manager
 AppComments=DPF Manager
@@ -87,4 +87,4 @@ end;
 
 
 
-
+
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>com.easyinnova</groupId>
 	<artifactId>dpf_manager</artifactId>
 	<packaging>jar</packaging>
-	<version>2.2</version>
+	<version>2.3</version>
 
     <!--Properties-->
     <properties>

diff --git a/src/main/java/dpfmanager/conformancechecker/tiff/implementation_checker/Validator.java b/src/main/java/dpfmanager/conformancechecker/tiff/implementation_checker/Validator.java
@@ -214,6 +214,8 @@ boolean checkRule(RuleObject rule, TiffNode node) {
 
       // Analyze clausules
       for (String clausule : clausules.getClausules()) {
+        if (clausule.contains("*"))
+          clausule = clausule;
         if (clausule.startsWith("count(")) {
           // Child count
           String countField = clausule.substring(clausule.indexOf("(") + 1);

diff --git a/...ain/java/dpfmanager/conformancechecker/tiff/implementation_checker/rules/RuleElement.java b/...ain/java/dpfmanager/conformancechecker/tiff/implementation_checker/rules/RuleElement.java
@@ -13,13 +13,18 @@ public class RuleElement {
   TiffNode node;
   TiffNode model;
   public boolean valid;
+  String multiplier;
 
   public RuleElement(String field, TiffNode nodeBase, TiffNode model) {
     valid = true;
     this.node = nodeBase;
     this.model = model;
     filter = null;
     fieldName = field;
+    if (fieldName.contains("*")) {
+      multiplier = fieldName.substring(0, fieldName.indexOf("*"));
+      fieldName = fieldName.substring(fieldName.indexOf("*")+1);
+    }
     if (!fieldName.startsWith("$")) {
       while (fieldName.contains(".") || fieldName.contains("[")) {
         int indexDot = fieldName.indexOf(".");
@@ -89,6 +94,14 @@ public List<TiffNode> getChildren() {
     return node.getChildren(getName(), filter);
   }
 
+  String operateMultiplier(String val) {
+    String value = val;
+    if (multiplier != null) {
+      value = (Integer.parseInt(val) * Integer.parseInt(multiplier)) + "";
+    }
+    return value;
+  }
+
   public String getValue() {
     if (fieldName.startsWith("$") && fieldName.endsWith("$")) {
       String val = fieldName.replace("$", "");
@@ -104,16 +117,16 @@ public String getValue() {
         if (node == null) return null;
       }
       val = node.getValue();
-      return val;
-    }
-    if (fieldName.startsWith("'") && fieldName.endsWith("'")) {
+      return operateMultiplier(val);
+    } else if (fieldName.startsWith("'") && fieldName.endsWith("'")) {
       String val = fieldName.substring(1);
       val = val.substring(0, val.length() - 1);
-      return val;
+      return operateMultiplier(val);
     }
+
     try {
       int ival = Integer.parseInt(fieldName);
-      return ival + "";
+      return operateMultiplier(ival + "");
     } catch (Exception ex) {
 
     }
@@ -143,6 +156,6 @@ public String getValue() {
     } else {
       value = "";
     }
-    return value;
+    return operateMultiplier(value);
   }
 }
diff --git a/src/main/resources/implementationcheckers/BaselineProfileChecker.xml b/src/main/resources/implementationcheckers/BaselineProfileChecker.xml
@@ -1725,23 +1725,23 @@
  <rules description="cardinality-formulas">
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=JPEGLosslessPredictors].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of JPEGLosslessPredictors tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 22, page 107</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=JPEGPointTransforms].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of JPEGPointTransforms tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 22, page 107</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=JPEGQTables].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of JPEGQTables tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 22, page 107</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=JPEGDCTables].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of JPEGDCTables tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 22, page 107</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=JPEGACTables].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of JPEGACTables tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 22, page 107</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=WhiteLevel].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of WhiteLevel tag must match SamplesPerPixel value</assert>
@@ -1753,26 +1753,34 @@
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=MinSampleValue].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of MinSampleValue tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 8, page 35</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=MaxSampleValue].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of MaxSampleValue tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 8, page 35</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=SMinSampleValue].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of SMinSampleValue tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 8, page 35</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=SMaxSampleValue].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of SMaxSampleValue tag must match SamplesPerPixel value</assert>
-   <reference></reference>
+   <reference>Section 8, page 35</reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=ImageBaseColor].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of ImageBaseColor tag must match SamplesPerPixel value</assert>
    <reference></reference>
   </rule>
   <rule context="ifd[class=image]">
    <assert test="{tags.tag[name=SampleFormat].cardinality == tags.tag[name=SamplesPerPixel]}">Cardinality of SampleFormat tag must match SamplesPerPixel value</assert>
+   <reference>Section 19, page 80</reference>
+  </rule>
+  <rule context="ifd[class=image]">
+   <assert test="{tags.tag[name=CMYKEquivalent].cardinality == 4*tags.tag[name=SamplesPerPixel]}">CMYKEquivalent count must be 4*Bits per Sample</assert>
+   <reference>Section 16, page 69</reference>
+  </rule>
+  <rule context="ifd[class=image]">
+   <assert test="{tags.tag[name=Decode].cardinality == 2*tags.tag[name=Decode]}">Decode count must be 2*Bits per Sample</assert>
    <reference></reference>
   </rule>
  </rules>