Fixed bugs in AppCanvas::readColorPixels() and

AppCanvas::readDepthPixels() that caused a crash when
the aspect ratio was not 1:1.

1 files changed, 14 insertions, 4 deletions

diff --git a/source/blender/freestyle/intern/application/AppCanvas.h b/source/blender/freestyle/intern/application/AppCanvas.h
index 7678014d4a0..b45aafbaf33 100755
--- a/source/blender/freestyle/intern/application/AppCanvas.h
+++ b/source/blender/freestyle/intern/application/AppCanvas.h
@@ -48,11 +48,21 @@ public:
   void setViewer(AppView *iViewer) ;
 
   // soc
-  void setPassDiffuse(float *p) {_pass_diffuse = p;}
-  void setPassZ(float *p) {_pass_z = p;}
+  void setPassDiffuse(float *buf, int width, int height) {
+      _pass_diffuse.buf = buf;
+      _pass_diffuse.width = width;
+      _pass_diffuse.height = height;
+  }
+  void setPassZ(float *buf, int width, int height) {
+      _pass_z.buf = buf;
+      _pass_z.width = width;
+      _pass_z.height = height;
+  }
 private:
-  float *_pass_diffuse;
-  float *_pass_z;
+    struct {
+        float *buf;
+        int width, height;
+    } _pass_diffuse, _pass_z;
 };