Merge pull request #769 from kkujala/master

Refactor colorspace.js and fix jslint warnings.

src/colorspace.js

@@ -23,7 +23,7 @@ var ColorSpace = (function colorSpaceColorSpace() {
   };
 
   constructor.parse = function colorSpaceParse(cs, xref, res) {
-    var IR = constructor.parseToIR(cs, xref, res, true);
+    var IR = constructor.parseToIR(cs, xref, res);
     if (IR instanceof SeparationCS)
       return IR;
 
@@ -31,12 +31,7 @@ var ColorSpace = (function colorSpaceColorSpace() {
   };
 
   constructor.fromIR = function colorSpaceFromIR(IR) {
-    var name;
+    var name = isArray(IR) ? IR[0] : IR;
-    if (isArray(IR)) {
-      name = IR[0];
-    } else {
-      name = IR;
-    }
 
     switch (name) {
       case 'DeviceGrayCS':
@@ -46,33 +41,28 @@ var ColorSpace = (function colorSpaceColorSpace() {
       case 'DeviceCmykCS':
         return new DeviceCmykCS();
       case 'PatternCS':
-        var baseCS = IR[1];
+        var basePatternCS = IR[1];
-        if (baseCS == null) {
+        if (basePatternCS)
-          return new PatternCS(null);
+          basePatternCS = ColorSpace.fromIR(basePatternCS);
-        } else {
+        return new PatternCS(basePatternCS);
-          return new PatternCS(ColorSpace.fromIR(baseCS));
-        }
       case 'IndexedCS':
-        var baseCS = IR[1];
+        var baseIndexedCS = IR[1];
         var hiVal = IR[2];
         var lookup = IR[3];
-        return new IndexedCS(ColorSpace.fromIR(baseCS), hiVal, lookup);
+        return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup);
       case 'SeparationCS':
         var alt = IR[1];
         var tintFnIR = IR[2];
 
-        return new SeparationCS(
+        return new SeparationCS(ColorSpace.fromIR(alt),
-          ColorSpace.fromIR(alt),
+                                PDFFunction.fromIR(tintFnIR));
-          PDFFunction.fromIR(tintFnIR)
-        );
       default:
         error('Unkown name ' + name);
     }
     return null;
-  }
+  };
 
-  constructor.parseToIR = function colorSpaceParseToIR(cs, xref, res,
+  constructor.parseToIR = function colorSpaceParseToIR(cs, xref, res) {
-                                                       parseOnly) {
     if (isName(cs)) {
       var colorSpaces = xref.fetchIfRef(res.get('ColorSpace'));
       if (isDict(colorSpaces)) {
@@ -83,9 +73,10 @@ var ColorSpace = (function colorSpaceColorSpace() {
     }
 
     cs = xref.fetchIfRef(cs);
+    var mode;
 
     if (isName(cs)) {
-      var mode = cs.name;
+      mode = cs.name;
       this.mode = mode;
 
       switch (mode) {
@@ -104,7 +95,7 @@ var ColorSpace = (function colorSpaceColorSpace() {
           error('unrecognized colorspace ' + mode);
       }
     } else if (isArray(cs)) {
-      var mode = cs[0].name;
+      mode = cs[0].name;
       this.mode = mode;
 
       switch (mode) {
@@ -133,15 +124,15 @@ var ColorSpace = (function colorSpaceColorSpace() {
             return 'DeviceCmykCS';
           break;
         case 'Pattern':
-          var baseCS = cs[1];
+          var basePatternCS = cs[1];
-          if (baseCS)
+          if (basePatternCS)
-            baseCS = ColorSpace.parseToIR(baseCS, xref, res);
+            basePatternCS = ColorSpace.parseToIR(basePatternCS, xref, res);
-          return ['PatternCS', baseCS];
+          return ['PatternCS', basePatternCS];
         case 'Indexed':
-          var baseCS = ColorSpace.parseToIR(cs[1], xref, res);
+          var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
           var hiVal = cs[2] + 1;
           var lookup = xref.fetchIfRef(cs[3]);
-          return ['IndexedCS', baseCS, hiVal, lookup];
+          return ['IndexedCS', baseIndexedCS, hiVal, lookup];
         case 'Separation':
           var alt = ColorSpace.parseToIR(cs[2], xref, res);
           var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3]));
@@ -165,7 +156,6 @@ var SeparationCS = (function separationCS() {
     this.name = 'Separation';
     this.numComps = 1;
     this.defaultColor = [1];
-
     this.base = base;
     this.tintFn = tintFn;
   }
@@ -179,12 +169,11 @@ var SeparationCS = (function separationCS() {
       var tintFn = this.tintFn;
       var base = this.base;
       var scale = 1 / ((1 << bits) - 1);
-
       var length = input.length;
       var pos = 0;
-
       var numComps = base.numComps;
       var baseBuf = new Uint8Array(numComps * length);
+
       for (var i = 0; i < length; ++i) {
         var scaled = input[i] * scale;
         var tinted = tintFn([scaled]);
@@ -213,13 +202,13 @@ var IndexedCS = (function indexedCS() {
     this.name = 'Indexed';
     this.numComps = 1;
     this.defaultColor = [0];
-
     this.base = base;
-    var baseNumComps = base.numComps;
     this.highVal = highVal;
 
+    var baseNumComps = base.numComps;
     var length = baseNumComps * highVal;
     var lookupArray = new Uint8Array(length);
+
     if (isStream(lookup)) {
       var bytes = lookup.getBytes(length);
       lookupArray.set(bytes);
@@ -235,7 +224,6 @@ var IndexedCS = (function indexedCS() {
   constructor.prototype = {
     getRgb: function indexcs_getRgb(color) {
       var numComps = this.base.numComps;
-
       var start = color[0] * numComps;
       var c = [];
 
@@ -249,9 +237,9 @@ var IndexedCS = (function indexedCS() {
       var numComps = base.numComps;
       var lookup = this.lookup;
       var length = input.length;
-
       var baseBuf = new Uint8Array(length * numComps);
       var baseBufPos = 0;
+
       for (var i = 0; i < length; ++i) {
         var lookupPos = input[i] * numComps;
         for (var j = 0; j < numComps; ++j) {
@@ -294,7 +282,7 @@ var DeviceGrayCS = (function deviceGrayCS() {
 })();
 
 var DeviceRgbCS = (function deviceRgbCS() {
-  function constructor(bits) {
+  function constructor() {
     this.name = 'DeviceRGB';
     this.numComps = 3;
     this.defaultColor = [0, 0, 0];