Attachment 190351 Details for Bug 225557 – patch-include_vigra-ext_impexalpha_hxx

[patch] patch-include_vigra-ext_impexalpha_hxx

patch-include_vigra-ext_impexalpha_hxx (text/plain), 1.99 KB, created by Walter Schwarzenfeld on 2018-02-06 01:33:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2018-02-06 01:33:40 UTC

Size: 1.99 KB

patch

obsolete

>--- include/vigra_ext/impexalpha.hxx	Mon Sep 28 09:41:56 2015 +0200
>+++ include/vigra_ext/impexalpha.hxx	Sun Jan 24 17:05:51 2016 +0100
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2012-2014 Christoph L. Spiel
>+ * Copyright (C) 2012-2016 Christoph L. Spiel
>  *
>  * This file is part of Enblend.
>  *
>@@ -26,6 +26,9 @@
> #include <vigra/imageinfo.hxx>
> #include <vigra/impex.hxx>
> 
>+#ifndef VIGRA_UNIQUE_PTR
>+#define VIGRA_UNIQUE_PTR std::auto_ptr
>+#endif
> 
> namespace vigra_ext
> {
>@@ -194,7 +197,7 @@
>                          AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
>                          vigra::VigraTrueType)
>         {
>-            std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
>+            VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
> 
>             switch (pixel_t_of_string(decoder->getPixelType()))
>             {
>@@ -249,7 +252,7 @@
>                          AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
>                          vigra::VigraFalseType)
>         {
>-            std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
>+            VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
> 
>             switch (pixel_t_of_string(decoder->getPixelType()))
>             {
>@@ -467,7 +470,7 @@
>                          vigra::VigraTrueType)
>         {
>             const std::string pixel_type(export_info.getPixelType());
>-            std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
>+            VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
> 
>             encoder->setPixelType(pixel_type);
> 
>@@ -525,7 +528,7 @@
>                          vigra::VigraFalseType)
>         {
>             const std::string pixel_type(export_info.getPixelType());
>-            std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
>+            VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
> 
>             encoder->setPixelType(pixel_type);
> 
>

Actions: View | Diff

Attachments on bug 225557: 190351