X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=0b06d39b1f3f215698d850452cf2f951371bab48;hb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6;hp=8e7a51fd8d39371c278b65c125e710396565be21;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;p=dcpomatic.git

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 8e7a51fd8..0b06d39b1 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -41,7 +41,6 @@ using std::min;
 using std::cout;
 using std::cerr;
 using std::list;
-using std::stringstream;
 using boost::shared_ptr;
 using dcp::Size;
 
@@ -322,6 +321,7 @@ Image::make_black ()
 	case PIX_FMT_RGBA:
 	case PIX_FMT_ABGR:
 	case PIX_FMT_BGRA:
+	case PIX_FMT_RGB555LE:
 		memset (data()[0], 0, lines(0) * stride()[0]);
 		break;
 
@@ -359,16 +359,19 @@ Image::make_transparent ()
 void
 Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 {
-	int this_bpp = 0;
-	int other_bpp = 0;
+	assert (other->pixel_format() == PIX_FMT_RGBA);
+	int const other_bpp = 4;
 
-	if (_pixel_format == PIX_FMT_BGRA && other->pixel_format() == PIX_FMT_RGBA) {
+	int this_bpp = 0;
+	switch (_pixel_format) {
+	case PIX_FMT_BGRA:
+	case PIX_FMT_RGBA:
 		this_bpp = 4;
-		other_bpp = 4;
-	} else if (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA) {
+		break;
+	case PIX_FMT_RGB24:
 		this_bpp = 3;
-		other_bpp = 4;
-	} else {
+		break;
+	default:
 		assert (false);
 	}
 
@@ -389,13 +392,15 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 	}
 
 	for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
-		uint8_t* tp = data()[0] + ty * stride()[0] + position.x * this_bpp;
+		uint8_t* tp = data()[0] + ty * stride()[0] + start_tx * this_bpp;
 		uint8_t* op = other->data()[0] + oy * other->stride()[0];
 		for (int tx = start_tx, ox = start_ox; tx < size().width && ox < other->size().width; ++tx, ++ox) {
 			float const alpha = float (op[3]) / 255;
-			tp[0] = (tp[0] * (1 - alpha)) + op[0] * alpha;
-			tp[1] = (tp[1] * (1 - alpha)) + op[1] * alpha;
-			tp[2] = (tp[2] * (1 - alpha)) + op[2] * alpha;
+			tp[0] = op[0] + (tp[0] * (1 - alpha));
+			tp[1] = op[1] + (tp[1] * (1 - alpha));
+			tp[2] = op[2] + (tp[2] * (1 - alpha));
+			tp[3] = op[3] + (tp[3] * (1 - alpha));
+			
 			tp += this_bpp;
 			op += other_bpp;
 		}
@@ -656,6 +661,10 @@ merge (list<PositionImage> images)
 		return PositionImage ();
 	}
 
+	if (images.size() == 1) {
+		return images.front ();
+	}
+
 	dcpomatic::Rect<int> all (images.front().position, images.front().image->size().width, images.front().image->size().height);
 	for (list<PositionImage>::const_iterator i = images.begin(); i != images.end(); ++i) {
 		all.extend (dcpomatic::Rect<int> (i->position, i->image->size().width, i->image->size().height));
@@ -664,7 +673,7 @@ merge (list<PositionImage> images)
 	shared_ptr<Image> merged (new Image (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true));
 	merged->make_transparent ();
 	for (list<PositionImage>::const_iterator i = images.begin(); i != images.end(); ++i) {
-		merged->alpha_blend (i->image, i->position);
+		merged->alpha_blend (i->image, i->position - all.position());
 	}
 
 	return PositionImage (merged, all.position ());
@@ -681,3 +690,30 @@ Image::digest () const
 
 	return digester.get ();
 }
+
+bool
+operator== (Image const & a, Image const & b)
+{
+	if (a.components() != b.components() || a.pixel_format() != b.pixel_format() || a.aligned() != b.aligned()) {
+		return false;
+	}
+
+	for (int c = 0; c < a.components(); ++c) {
+		if (a.lines(c) != b.lines(c) || a.line_size()[c] != b.line_size()[c] || a.stride()[c] != b.stride()[c]) {
+			return false;
+		}
+
+		uint8_t* p = a.data()[c];
+		uint8_t* q = b.data()[c];
+		for (int y = 0; y < a.lines(c); ++y) {
+			if (memcmp (p, q, a.line_size()[c]) != 0) {
+				return false;
+			}
+
+			p += a.stride()[c];
+			q += b.stride()[c];
+		}
+	}
+
+	return true;
+}