From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 5 Apr 2012 19:46:23 +0000 (-0700)
Subject: Merge upstream.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fece736b8a14c6f6174c61b242cc804bf6b93213;p=pdf.js.git

Merge upstream.
---

fece736b8a14c6f6174c61b242cc804bf6b93213
diff --cc src/evaluator.js
index 68ca9f6,203247b..7f8ffc5
--- a/src/evaluator.js
+++ b/src/evaluator.js
@@@ -303,10 -303,10 +303,10 @@@ var PartialEvaluator = (function Partia
                    args = TilingPattern.getIR(operatorList, dict, args);
                  }
                  else if (typeNum == SHADING_PATTERN) {
-                   var shading = xref.fetchIfRef(dict.get('Shading'));
+                   var shading = dict.get('Shading');
                    var matrix = dict.get('Matrix');
 -                  var pattern = Pattern.parseShading(shading, matrix, xref, res,
 -                                                                  null /*ctx*/);
 +                  var pattern = Pattern.parseShading(shading, matrix, xref,
 +                                                     res);
                    args = pattern.getIR();
                  } else {
                    error('Unkown PatternType ' + typeNum);
diff --cc src/pattern.js
index e31fdbe,51977c6..9ff4a77
--- a/src/pattern.js
+++ b/src/pattern.js
@@@ -22,11 -22,12 +22,11 @@@ var Pattern = (function PatternClosure(
      }
    };
  
-   Pattern.shadingFromIR = function pattern_shadingFromIR(raw) {
 -  Pattern.shadingFromIR = function Pattern_shadingFromIR(ctx, raw) {
 -    return Shadings[raw[0]].fromIR(ctx, raw);
++  Pattern.shadingFromIR = function Pattern_shadingFromIR(raw) {
 +    return Shadings[raw[0]].fromIR(raw);
    };
  
-   Pattern.parseShading = function pattern_shading(shading, matrix, xref, res) {
 -  Pattern.parseShading = function Pattern_parseShading(shading, matrix, xref,
 -                                                      res, ctx) {
++  Pattern.parseShading = function Pattern_parseShading(shading, matrix, xref, res) {
  
      var dict = isStream(shading) ? shading.dict : shading;
      var type = dict.get('ShadingType');
@@@ -101,7 -101,7 +100,7 @@@ Shadings.RadialAxial = (function Radial
      this.colorStops = colorStops;
    }
  
-   RadialAxial.fromIR = function radialAxialShadingGetIR(raw) {
 -  RadialAxial.fromIR = function RadialAxial_fromIR(ctx, raw) {
++  RadialAxial.fromIR = function RadialAxial_fromIR(raw) {
      var type = raw[1];
      var colorStops = raw[2];
      var p0 = raw[3];