Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / image.cc

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 92b850a62bce981e373cce86d199e25367fbfbad..1735bb38ad81433a9e482e3628b5a4c0175dde46 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -26,7 +27,6 @@
 #include "timer.h"
 #include "rect.h"
 #include "util.h"
-#include "md5_digester.h"
 #include "dcpomatic_socket.h"
 extern "C" {
 #include <libswscale/swscale.h>
@@ -83,17 +83,6 @@ Image::sample_size (int n) const
                );
 }
 
-int
-Image::components () const
-{
-       AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
-       if (!d) {
-               throw PixelFormatError ("components()", _pixel_format);
-       }
-
-       return d->nb_components;
-}
-
 /** @return Number of planes */
 int
 Image::planes () const
@@ -425,6 +414,7 @@ Image::make_transparent ()
 void
 Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 {
+       /* We're blending RGBA images; first byte is blue, second byte is green, third byte blue, fourth byte alpha */
        DCPOMATIC_ASSERT (other->pixel_format() == AV_PIX_FMT_RGBA);
        int const other_bpp = 4;
 
@@ -447,15 +437,16 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
        switch (_pixel_format) {
        case AV_PIX_FMT_RGB24:
        {
+               /* Going onto RGB24.  First byte is red, second green, third blue */
                int const this_bpp = 3;
                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] + 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] = op[0] * alpha + tp[0] * (1 - alpha);
+                               tp[0] = op[2] * alpha + tp[0] * (1 - alpha);
                                tp[1] = op[1] * alpha + tp[1] * (1 - alpha);
-                               tp[2] = op[2] * alpha + tp[2] * (1 - alpha);
+                               tp[2] = op[0] * alpha + tp[2] * (1 - alpha);
 
                                tp += this_bpp;
                                op += other_bpp;
@@ -757,6 +748,7 @@ Image::swap (Image & other)
        }
 
        std::swap (_aligned, other._aligned);
+       std::swap (_extra_pixels, other._extra_pixels);
 }
 
 /** Destroy a Image */