fixed some minor errors

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195974 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/pdf/FlateFilter.java b/src/org/apache/fop/pdf/FlateFilter.java
index c16f2965fc17a18d02bc7c36a8a296e212c0ea81..0547adf2f4b193a5d8e1fbd1c1e4b6c8359656eb 100644 (file)
--- a/src/org/apache/fop/pdf/FlateFilter.java
+++ b/src/org/apache/fop/pdf/FlateFilter.java
@@ -135,8 +135,8 @@ public class FlateFilter extends PDFFilter {
      * @param predictor the predictor to use
      * @throws PDFFilterException if there is an error with the predictor
      */
-    public void setPredictor(int predictor) throws PDFFilterException {
-        predictor = predictor;
+    public void setPredictor(int pred) throws PDFFilterException {
+        predictor = pred;
 
     }
 
@@ -155,9 +155,9 @@ public class FlateFilter extends PDFFilter {
      * @param colors the colors to use
      * @throws PDFFilterException if predictor is not PREDICTION_NONE
      */
-    public void setColors(int colors) throws PDFFilterException {
+    public void setColors(int cols) throws PDFFilterException {
         if (predictor != PREDICTION_NONE) {
-            colors = colors;
+            colors = cols;
         } else {
             throw new PDFFilterException(
                           "Prediction must not be PREDICTION_NONE in"
@@ -205,9 +205,9 @@ public class FlateFilter extends PDFFilter {
      * @param columns the number of columns to use for the filter
      * @throws PDFFilterException if predictor is not PREDICTION_NONE
      */
-    public void setColumns(int columns) throws PDFFilterException {
+    public void setColumns(int cols) throws PDFFilterException {
         if (predictor != PREDICTION_NONE) {
-            columns = columns;
+            columns = cols;
         } else {
             throw new PDFFilterException(
                       "Prediction must not be PREDICTION_NONE in"

diff --git a/src/org/apache/fop/pdf/PDFColor.java b/src/org/apache/fop/pdf/PDFColor.java
index 64955fb0d91cef09154f018e90f21522f9ada310..89a59e83ff696390f99c0f3c0f7e24726ba08cf0 100644 (file)
--- a/src/org/apache/fop/pdf/PDFColor.java
+++ b/src/org/apache/fop/pdf/PDFColor.java
@@ -314,9 +314,9 @@ public class PDFColor extends PDFPathPaint {
         this.green = 1.0 - this.green;
         this.blue = 1.0 - this.yellow;
 
-        this.red = (this.black / this.blackFactor) + this.red;
-        this.green = (this.black / this.blackFactor) + this.green;
-        this.blue = (this.black / this.blackFactor) + this.blue;
+        this.red = (this.black / PDFColor.blackFactor) + this.red;
+        this.green = (this.black / PDFColor.blackFactor) + this.green;
+        this.blue = (this.black / PDFColor.blackFactor) + this.blue;
 
     }
 
@@ -381,7 +381,7 @@ public class PDFColor extends PDFPathPaint {
             tempDouble = this.yellow;
         }
 
-        this.black = (tempDouble / this.blackFactor);
+        this.black = (tempDouble / PDFColor.blackFactor);
 
     }
 
@@ -402,7 +402,7 @@ public class PDFColor extends PDFPathPaint {
             tempDouble = this.blue;
         }
 
-        this.black = 1.0 - (tempDouble / this.blackFactor);
+        this.black = 1.0 - (tempDouble / PDFColor.blackFactor);
     }
 
     /**