enblend-4.1.4-gcc6.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990
  1. diff -r 6aec0cc8d22a -r 467a73754dbb include/vigra_ext/impexalpha.hxx
  2. --- a/include/vigra_ext/impexalpha.hxx Mon Sep 28 09:41:56 2015 +0200
  3. +++ b/include/vigra_ext/impexalpha.hxx Sun Jan 24 17:05:51 2016 +0100
  4. @@ -1,5 +1,5 @@
  5. /*
  6. - * Copyright (C) 2012-2014 Christoph L. Spiel
  7. + * Copyright (C) 2012-2016 Christoph L. Spiel
  8. *
  9. * This file is part of Enblend.
  10. *
  11. @@ -26,6 +26,9 @@
  12. #include <vigra/imageinfo.hxx>
  13. #include <vigra/impex.hxx>
  14. +#ifndef VIGRA_UNIQUE_PTR
  15. +#define VIGRA_UNIQUE_PTR std::auto_ptr
  16. +#endif
  17. namespace vigra_ext
  18. {
  19. @@ -194,7 +197,7 @@
  20. AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
  21. vigra::VigraTrueType)
  22. {
  23. - std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
  24. + VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
  25. switch (pixel_t_of_string(decoder->getPixelType()))
  26. {
  27. @@ -249,7 +252,7 @@
  28. AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
  29. vigra::VigraFalseType)
  30. {
  31. - std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
  32. + VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
  33. switch (pixel_t_of_string(decoder->getPixelType()))
  34. {
  35. @@ -467,7 +470,7 @@
  36. vigra::VigraTrueType)
  37. {
  38. const std::string pixel_type(export_info.getPixelType());
  39. - std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
  40. + VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
  41. encoder->setPixelType(pixel_type);
  42. @@ -525,7 +528,7 @@
  43. vigra::VigraFalseType)
  44. {
  45. const std::string pixel_type(export_info.getPixelType());
  46. - std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
  47. + VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
  48. encoder->setPixelType(pixel_type);
  49. diff -r 596efbff27a8 -r 73e6f16de80a src/filespec.cc
  50. --- a/src/filespec.cc Sun Jan 24 17:06:09 2016 +0100
  51. +++ b/src/filespec.cc Mon Feb 15 10:20:30 2016 +0100
  52. @@ -37,7 +37,6 @@
  53. #include <cctype>
  54. #include <boost/algorithm/string/case_conv.hpp>
  55. -#include <boost/assign/list_of.hpp>
  56. #include <vigra/imageinfo.hxx>
  57. @@ -412,17 +411,12 @@
  58. public:
  59. Globbing() : algorithm_name_("literal"), algorithm_(NULL)
  60. {
  61. - installed_algorithms_ =
  62. - boost::assign::map_list_of
  63. - ("literal", MAKE_ALGORITHM(new LiteralGlobbingAlgorithm))
  64. - ("wildcard", MAKE_ALGORITHM(new WildcardGlobbingAlgorithm))
  65. + installed_algorithms_["literal"] = MAKE_ALGORITHM(new LiteralGlobbingAlgorithm);
  66. + installed_algorithms_["wildcard"] = MAKE_ALGORITHM(new WildcardGlobbingAlgorithm);
  67. + setup_alias("literal", "none");
  68. +
  69. #ifndef _WIN32
  70. - ("shell", MAKE_ALGORITHM(new ShellGlobbingAlgorithm))
  71. -#endif
  72. - ;
  73. -
  74. - setup_alias("literal", "none");
  75. -#ifndef _WIN32
  76. + installed_algorithms_["shell"] = MAKE_ALGORITHM(new ShellGlobbingAlgorithm);
  77. setup_alias("shell", "sh");
  78. #endif
  79. }