1 files changed, 8 insertions, 15 deletions

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index eb17813e..6be50b6d 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -36,6 +36,7 @@
 #include "util.h"
 #include "exceptions.h"
 #include "picture_frame.h"
+#include "xyz_frame.h"
 
 using std::string;
 using std::ostream;
@@ -337,30 +338,25 @@ PictureAsset::frame_buffer_equals (
 	}
 		
 	/* Decompress the images to bitmaps */
-	opj_image_t* image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
-	opj_image_t* image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
+	shared_ptr<XYZFrame> image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
+	shared_ptr<XYZFrame> image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
 	
 	/* Compare them */
 	
-	if (image_A->numcomps != image_B->numcomps) {
-		note (ERROR, "image component counts for frame " + lexical_cast<string>(frame) + " differ");
-		return false;
-	}
-	
-	vector<int> abs_diffs (image_A->comps[0].w * image_A->comps[0].h * image_A->numcomps);
+	vector<int> abs_diffs (image_A->size().width * image_A->size().height * 3);
 	int d = 0;
 	int max_diff = 0;
 	
-	for (int c = 0; c < image_A->numcomps; ++c) {
+	for (int c = 0; c < 3; ++c) {
 		
-		if (image_A->comps[c].w != image_B->comps[c].w || image_A->comps[c].h != image_B->comps[c].h) {
+		if (image_A->size() != image_B->size()) {
 			note (ERROR, "image sizes for frame " + lexical_cast<string>(frame) + " differ");
 			return false;
 		}
 		
-		int const pixels = image_A->comps[c].w * image_A->comps[c].h;
+		int const pixels = image_A->size().width * image_A->size().height;
 		for (int j = 0; j < pixels; ++j) {
-			int const t = abs (image_A->comps[c].data[j] - image_B->comps[c].data[j]);
+			int const t = abs (image_A->data(c)[j] - image_B->data(c)[j]);
 			abs_diffs[d++] = t;
 			max_diff = max (max_diff, t);
 		}
@@ -392,9 +388,6 @@ PictureAsset::frame_buffer_equals (
 		return false;
 	}
 
-	opj_image_destroy (image_A);
-	opj_image_destroy (image_B);
-
 	return true;
 }