View Issue Details

IDProjectCategoryView StatusLast Update
0015983ScribusGeneralpublic2019-12-13 17:39
Reporterale Assigned To 
PrioritynormalSeverityminorReproducibilityN/A
Status newResolutionopen 
Product Version1.5.6.svn 
Target VersionFixed in Version 
Summary0015983: [PATCH] thirdparty/pgf: libpgf is packaged for debian and maintained
Descriptionsince libpgf is packaged for debian and maintained, wouldn't it be better to use the upstream libraries?

http://www.libpgf.org/index.php?id=3

or at least update the thirdparty code to the current one

(i've noticed that pgf exist because of warnings popping up while compiling...)
TagsNo tags attached.
PatchYes

Activities

christoph_s

2019-12-02 23:58

administrator   ~0047190

I suggest option 2, because it needs to be available not only for Debian but also other distros, as well as Windows and Mac OSX.

ale

2019-12-03 11:03

manager   ~0047191

- https://software.opensuse.org/package/libpgf
- https://src.fedoraproject.org/rpms/libpgf

- for windows we never use packaged libraries, so it's about providing our own .dll (if upstream does not provide one)
- no idea how the packaging for macos works, but i guess that it will be the same as for the librevenge libraries (as an example)

all in all, i think that we should avoid providing copies of libraries that are maintained and normally distributed through other means.

cbradney

2019-12-08 21:35

administrator   ~0047214

I can get it from macports, but I am not sure why we've brought it in source. Either it was not maintained for awhile, or we had to modify significant portions of the code to make use of it, or it was a massive library we didnt need all of.

cbradney

2019-12-08 21:37

administrator   ~0047215

Author: fschmid
Date: Sun Nov 7 09:40:03 2010
New Revision: 15796

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15796
Log:
Added the PGF image format, see http://www.libpgf.org for details.



To remove this, we'd need a CMake finder module to start with

ale

2019-12-08 21:47

manager   ~0047217

it has been in debian since 2012... so at the time franz added it, it's likely that it was not packaged by the distributions.

i'm not sure that a pgf file has ever been used in a scribus document, but i might try to find out if i can use the debian package...

i might have a look at it...

ale

2019-12-09 10:58

manager   ~0047227

ok, i had a look it.

libpgf does not have cmake files. so, before we can use their lib they should probably add support for cmake...
and then wait for the new version of the library to hit most distributions.

i guess that we should copy a new version then... and the next time think about removing support for it... except if it gets traction...

ale

2019-12-09 11:02

manager   ~0047228

Last edited: 2019-12-09 11:03

View 2 revisions

... oops... it has a cmakelists.txt file...

... but probably not in the version distributed by debian...

cbradney

2019-12-09 11:21

administrator   ~0047229

We aren’t removing support for the file format.

ale

2019-12-13 09:45

manager   ~0047262

Last edited: 2019-12-13 17:39

View 2 revisions

a patch is here
https://gitlab.com/scribus/scribus/merge_requests/20

and it's also attached.



libpgf.diff (269,637 bytes)
diff --git a/scribus/imagedataloaders/scimgdataloader_pgf.cpp b/scribus/imagedataloaders/scimgdataloader_pgf.cpp
index e182ca4eed5e3da5b50d2592db71f8cea51fbdaa..19511f637cd8fb93c90ead6b9d8fb75c63663f6e 100644
--- a/scribus/imagedataloaders/scimgdataloader_pgf.cpp
+++ b/scribus/imagedataloaders/scimgdataloader_pgf.cpp
@@ -194,7 +194,7 @@ bool ScImgDataLoader_PGF::loadPicture(const QString& fn, int /*page*/, int /*res
 				pgfImg.GetBitmap(m_image.bytesPerLine(), (UINT8*)m_image.bits(), m_image.depth(), map);
 			}
 		}
-		pgfImg.Close();
+		pgfImg.Destroy();
 #ifdef WIN32
 		CloseHandle(fd);
 #else
diff --git a/scribus/third_party/pgf/BitStream.h b/scribus/third_party/pgf/BitStream.h
index 2e41c27fab966882b8ae801c61e2f4db7a10b900..7ff6a1373cb3473a615823e576215cd1e47365d5 100644
--- a/scribus/third_party/pgf/BitStream.h
+++ b/scribus/third_party/pgf/BitStream.h
@@ -31,6 +31,7 @@
 
 #include "PGFtypes.h"
 
+//////////////////////////////////////////////////////////////////////
 // constants
 //static const WordWidth = 32;
 //static const WordWidthLog = 5;
@@ -38,7 +39,20 @@ static const UINT32 Filled = 0xFFFFFFFF;
 
 /// @brief Make 64 bit unsigned integer from two 32 bit unsigned integers
 #define MAKEU64(a, b) ((UINT64) (((UINT32) (a)) | ((UINT64) ((UINT32) (b))) << 32)) 
- 
+
+/*
+static UINT8 lMask[] = {
+	0x00,                       // 00000000
+	0x80,                       // 10000000 
+	0xc0,                       // 11000000
+	0xe0,                       // 11100000
+	0xf0,                       // 11110000
+	0xf8,                       // 11111000
+	0xfc,                       // 11111100
+	0xfe,                       // 11111110
+	0xff,                       // 11111111
+};
+*/
 // these procedures have to be inlined because of performance reasons
 
 //////////////////////////////////////////////////////////////////////
@@ -252,7 +266,61 @@ inline UINT32 SeekBit1Range(UINT32* stream, UINT32 pos, UINT32 len) {
 	}
 	return count;
 }
+/*
+//////////////////////////////////////////////////////////////////////
+/// BitCopy: copies k bits from source to destination
+/// Note: only 8 bits are copied at a time, if speed is an issue, a more
+/// complicated but faster 64 bit algorithm should be used.
+inline void BitCopy(const UINT8 *sStream, UINT32 sPos, UINT8 *dStream, UINT32 dPos, UINT32 k) {
+	ASSERT(k > 0);
 
+	div_t divS = div(sPos, 8);
+	div_t divD = div(dPos, 8);
+	UINT32 sOff = divS.rem;
+	UINT32 dOff = divD.rem;
+	INT32 tmp = div(dPos + k - 1, 8).quot;
+
+	const UINT8 *sAddr = sStream + divS.quot;
+	UINT8 *dAddrS = dStream + divD.quot;
+	UINT8 *dAddrE = dStream + tmp;
+	UINT8 eMask;
+
+	UINT8 destSB = *dAddrS;
+	UINT8 destEB = *dAddrE;
+	UINT8 *dAddr;
+	UINT8 prec;
+	INT32 shiftl, shiftr;
+
+	if (dOff > sOff) {
+		prec = 0;
+		shiftr = dOff - sOff;
+		shiftl = 8 - dOff + sOff;
+	} else {
+		prec = *sAddr << (sOff - dOff);
+		shiftr = 8 - sOff + dOff;
+		shiftl = sOff - dOff;
+		sAddr++;
+	}
+
+	for (dAddr = dAddrS; dAddr < dAddrE; dAddr++, sAddr++) {
+		*dAddr = prec | (*sAddr >> shiftr);
+		prec = *sAddr << shiftl;
+	}
+
+	if ((sPos + k)%8 == 0) {
+		*dAddr = prec;
+	} else {
+		*dAddr = prec | (*sAddr >> shiftr);
+	}
+
+	eMask = lMask[dOff];
+	*dAddrS = (destSB & eMask) | (*dAddrS & (~eMask));
+
+	INT32 mind = (dPos + k) % 8;
+	eMask = (mind) ? lMask[mind] : lMask[8];
+	*dAddrE = (destEB & (~eMask)) | (*dAddrE & eMask);
+}
+*/
 //////////////////////////////////////////////////////////////////////
 /// Compute bit position of the next 32-bit word
 /// @param pos current bit stream position
@@ -269,4 +337,5 @@ inline UINT32 AlignWordPos(UINT32 pos) {
 inline UINT32 NumberOfWords(UINT32 pos) {
 	return (pos + WordWidth - 1) >> WordWidthLog;
 }
+
 #endif //PGF_BITSTREAM_H
diff --git a/scribus/third_party/pgf/COPYING b/scribus/third_party/pgf/COPYING
new file mode 100644
index 0000000000000000000000000000000000000000..e8617e6042a5f7dda35fbb322ff47eb88599eaff
--- /dev/null
+++ b/scribus/third_party/pgf/COPYING
@@ -0,0 +1,458 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/scribus/third_party/pgf/Decoder.cpp b/scribus/third_party/pgf/Decoder.cpp
index ba79ccefe37d4dadd6854930f26d46b20d315f54..0e0db23941f114a7345a24b586ea5aceac202447 100644
--- a/scribus/third_party/pgf/Decoder.cpp
+++ b/scribus/third_party/pgf/Decoder.cpp
@@ -34,7 +34,7 @@
 //////////////////////////////////////////////////////
 // PGF: file structure
 //
-// PGFPreHeader PGFHeader PGFPostHeader LevelLengths Level_n-1 Level_n-2 ... Level_0
+// PGFPreHeader PGFHeader [PGFPostHeader] LevelLengths Level_n-1 Level_n-2 ... Level_0
 // PGFPostHeader ::= [ColorTable] [UserData]
 // LevelLengths  ::= UINT32[nLevels]
 
@@ -69,10 +69,10 @@
 /// @param levelLength The location of the levelLength array. The array is allocated in this method. The caller has to delete this array.
 /// @param userDataPos The stream position of the user data (metadata)
 /// @param useOMP If true, then the decoder will use multi-threading based on openMP
-/// @param skipUserData If true, then user data is not read. In case of available user data, the file position is still returned in userDataPos.
+/// @param userDataPolicy Policy of user data (meta-data) handling while reading PGF headers.
 CDecoder::CDecoder(CPGFStream* stream, PGFPreHeader& preHeader, PGFHeader& header, 
 				   PGFPostHeader& postHeader, UINT32*& levelLength, UINT64& userDataPos,
-				   bool useOMP, bool skipUserData) THROW_
+				   bool useOMP, UINT32 userDataPolicy)
 : m_stream(stream)
 , m_startPos(0)
 , m_streamSizeEstimation(0)
@@ -87,29 +87,6 @@ CDecoder::CDecoder(CPGFStream* stream, PGFPreHeader& preHeader, PGFHeader& heade
 
 	int count, expected;
 
-	// set number of threads
-#ifdef LIBPGF_USE_OPENMP 
-	m_macroBlockLen = omp_get_num_procs();
-#else
-	m_macroBlockLen = 1;
-#endif
-	
-	if (useOMP && m_macroBlockLen > 1) {
-#ifdef LIBPGF_USE_OPENMP
-		omp_set_num_threads(m_macroBlockLen);
-#endif
-
-		// create macro block array
-		m_macroBlocks = new(std::nothrow) CMacroBlock*[m_macroBlockLen];
-		if (!m_macroBlocks) ReturnWithError(InsufficientMemory);
-		for (int i=0; i < m_macroBlockLen; i++) m_macroBlocks[i] = new CMacroBlock();
-		m_currentBlock = m_macroBlocks[m_currentBlockIndex];
-	} else {
-		m_macroBlocks = 0;
-		m_macroBlockLen = 1; // there is only one macro block
-		m_currentBlock = new CMacroBlock(); 
-	}
-
 	// store current stream position
 	m_startPos = m_stream->GetPos();
 
@@ -153,33 +130,47 @@ CDecoder::CDecoder(CPGFStream* stream, PGFPreHeader& preHeader, PGFHeader& heade
 		if (preHeader.version & PGFROI) ReturnWithError(FormatCannotRead);
 #endif
 
-		int size = preHeader.hSize - HeaderSize;
+		UINT32 size = preHeader.hSize;
+
+		if (size > HeaderSize) {
+			size -= HeaderSize;
+			count = 0;
 
-		if (size > 0) {
 			// read post-header
 			if (header.mode == ImageModeIndexedColor) {
-				ASSERT((size_t)size >= ColorTableSize);
+				if (size < ColorTableSize) ReturnWithError(FormatCannotRead);
 				// read color table
 				count = expected = ColorTableSize;
 				m_stream->Read(&count, postHeader.clut);
 				if (count != expected) ReturnWithError(MissingData);
-				size -= count;
 			}
 
-			if (size > 0) {
+			if (size > (UINT32)count) {
+				size -= count;
+
+				// read/skip user data
+				UserdataPolicy policy = (UserdataPolicy)((userDataPolicy <= MaxUserDataSize) ? UP_CachePrefix : 0xFFFFFFFF - userDataPolicy);
 				userDataPos = m_stream->GetPos();
 				postHeader.userDataLen = size;
-				if (skipUserData) {
+
+				if (policy == UP_Skip) {
+					postHeader.cachedUserDataLen = 0;
+					postHeader.userData = nullptr;
 					Skip(size);
 				} else {
+					postHeader.cachedUserDataLen = (policy == UP_CachePrefix) ? __min(size, userDataPolicy) : size;
+
 					// create user data memory block
-					postHeader.userData = new(std::nothrow) UINT8[postHeader.userDataLen];
+					postHeader.userData = new(std::nothrow) UINT8[postHeader.cachedUserDataLen];
 					if (!postHeader.userData) ReturnWithError(InsufficientMemory);
 
 					// read user data
-					count = expected = postHeader.userDataLen;
+					count = expected = postHeader.cachedUserDataLen;
 					m_stream->Read(&count, postHeader.userData);
 					if (count != expected) ReturnWithError(MissingData);
+
+					// skip remaining user data
+					if (postHeader.cachedUserDataLen < size) Skip(size - postHeader.cachedUserDataLen);
 				}
 			}
 		}
@@ -209,6 +200,30 @@ CDecoder::CDecoder(CPGFStream* stream, PGFPreHeader& preHeader, PGFHeader& heade
 
 	// store current stream position
 	m_encodedHeaderLength = UINT32(m_stream->GetPos() - m_startPos);
+
+	// set number of threads
+#ifdef LIBPGF_USE_OPENMP 
+	m_macroBlockLen = omp_get_num_procs();
+#else
+	m_macroBlockLen = 1;
+#endif
+
+	if (useOMP && m_macroBlockLen > 1) {
+#ifdef LIBPGF_USE_OPENMP
+		omp_set_num_threads(m_macroBlockLen);
+#endif
+
+		// create macro block array
+		m_macroBlocks = new(std::nothrow) CMacroBlock*[m_macroBlockLen];
+		if (!m_macroBlocks) ReturnWithError(InsufficientMemory);
+		for (int i = 0; i < m_macroBlockLen; i++) m_macroBlocks[i] = new CMacroBlock();
+		m_currentBlock = m_macroBlocks[m_currentBlockIndex];
+	} else {
+		m_macroBlocks = 0;
+		m_macroBlockLen = 1; // there is only one macro block
+		m_currentBlock = new(std::nothrow) CMacroBlock();
+		if (!m_currentBlock) ReturnWithError(InsufficientMemory);
+	}
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -228,7 +243,7 @@ CDecoder::~CDecoder() {
 /// @param target The target buffer
 /// @param len The number of bytes to read
 /// @return The number of bytes copied to the target buffer
-UINT32 CDecoder::ReadEncodedData(UINT8* target, UINT32 len) const THROW_ {
+UINT32 CDecoder::ReadEncodedData(UINT8* target, UINT32 len) const {
 	ASSERT(m_stream);
 
 	int count = len;
@@ -248,7 +263,7 @@ UINT32 CDecoder::ReadEncodedData(UINT8* target, UINT32 len) const THROW_ {
 /// @param height The height of the rectangle
 /// @param startPos The relative subband position of the top left corner of the rectangular region
 /// @param pitch The number of bytes in row of the subband
-void CDecoder::Partition(CSubband* band, int quantParam, int width, int height, int startPos, int pitch) THROW_ {
+void CDecoder::Partition(CSubband* band, int quantParam, int width, int height, int startPos, int pitch) {
 	ASSERT(band);
 
 	const div_t ww = div(width, LinBlockSize);
@@ -310,12 +325,12 @@ void CDecoder::Partition(CSubband* band, int quantParam, int width, int height,
 }
 
 ////////////////////////////////////////////////////////////////////
-// Decode and dequantize HL, and LH band of one level
+// Decodes and dequantizes HL, and LH band of one level
 // LH and HH are interleaved in the codestream and must be split
 // Deccoding and dequantization of HL and LH Band (interleaved) using partitioning scheme
 // partitions the plane in squares of side length InterBlockSize
 // It might throw an IOException.
-void CDecoder::DecodeInterleaved(CWaveletTransform* wtChannel, int level, int quantParam) THROW_ {
+void CDecoder::DecodeInterleaved(CWaveletTransform* wtChannel, int level, int quantParam) {
 	CSubband* hlBand = wtChannel->GetSubband(level, HL);
 	CSubband* lhBand = wtChannel->GetSubband(level, LH);
 	const div_t lhH = div(lhBand->GetHeight(), InterBlockSize);
@@ -429,9 +444,9 @@ void CDecoder::DecodeInterleaved(CWaveletTransform* wtChannel, int level, int qu
 }
 
 ////////////////////////////////////////////////////////////////////
-/// Skip a given number of bytes in the open stream.
+/// Skips a given number of bytes in the open stream.
 /// It might throw an IOException.
-void CDecoder::Skip(UINT64 offset) THROW_ {
+void CDecoder::Skip(UINT64 offset) {
 	m_stream->SetPos(FSFromCurrent, offset);
 }
 
@@ -444,12 +459,12 @@ void CDecoder::Skip(UINT64 offset) THROW_ {
 /// @param band A subband
 /// @param bandPos A valid position in subband band
 /// @param quantParam The quantization parameter
-void CDecoder::DequantizeValue(CSubband* band, UINT32 bandPos, int quantParam) THROW_ {
+void CDecoder::DequantizeValue(CSubband* band, UINT32 bandPos, int quantParam) {
 	ASSERT(m_currentBlock);
 
 	if (m_currentBlock->IsCompletelyRead()) {
 		// all data of current macro block has been read --> prepare next macro block
-		DecodeTileBuffer();
+		GetNextMacroBlock();
 	}
 	
 	band->SetData(bandPos, m_currentBlock->m_value[m_currentBlock->m_valuePos] << quantParam);
@@ -457,9 +472,9 @@ void CDecoder::DequantizeValue(CSubband* band, UINT32 bandPos, int quantParam) T
 }
 
 //////////////////////////////////////////////////////////////////////
-// Read next group of blocks from stream and decodes them into macro blocks
+// Gets next macro block
 // It might throw an IOException.
-void CDecoder::DecodeTileBuffer() THROW_ {
+void CDecoder::GetNextMacroBlock() {
 	// current block has been read --> prepare next current block
 	m_macroBlocksAvailable--;
 
@@ -472,11 +487,11 @@ void CDecoder::DecodeTileBuffer() THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-// Read next block from stream and decode into macro block
+// Reads next block(s) from stream and decodes them
 // Decoding scheme: <wordLen>(16 bits) [ ROI ] data
 //		ROI	  ::= <bufferSize>(15 bits) <eofTile>(1 bit)
 // It might throw an IOException.
-void CDecoder::DecodeBuffer() THROW_ {
+void CDecoder::DecodeBuffer() {
 	ASSERT(m_macroBlocksAvailable <= 0);
 
 	// macro block management
@@ -493,8 +508,8 @@ void CDecoder::DecodeBuffer() THROW_ {
 				ReadMacroBlock(m_macroBlocks[i]);
 				m_macroBlocksAvailable++;
 			} catch(IOException& ex) {
-				if (ex.error == MissingData) {
-					break; // no further data available
+				if (ex.error == MissingData || ex.error == FormatCannotRead) {
+					break; // no further data available or the data isn't valid PGF data (might occur in streaming or PPPExt)
 				} else {
 					throw;
 				}
@@ -515,9 +530,9 @@ void CDecoder::DecodeBuffer() THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-// Read next block from stream and store it in the given block
+// Reads next block from stream and stores it in the given macro block
 // It might throw an IOException.
-void CDecoder::ReadMacroBlock(CMacroBlock* block) THROW_ {
+void CDecoder::ReadMacroBlock(CMacroBlock* block) {
 	ASSERT(block);
 
 	UINT16 wordLen;
@@ -533,18 +548,16 @@ void CDecoder::ReadMacroBlock(CMacroBlock* block) THROW_ {
 	count = expected = sizeof(UINT16);
 	m_stream->Read(&count, &wordLen); 
 	if (count != expected) ReturnWithError(MissingData);
-	wordLen = __VAL(wordLen);
-	if (wordLen > BufferSize) 
-		ReturnWithError(FormatCannotRead);
+	wordLen = __VAL(wordLen); // convert wordLen
+	if (wordLen > BufferSize) ReturnWithError(FormatCannotRead);
 
 #ifdef __PGFROISUPPORT__
 	// read ROIBlockHeader
 	if (m_roi) {
-		m_stream->Read(&count, &h.val); 
+		count = expected = sizeof(ROIBlockHeader);
+		m_stream->Read(&count, &h.val);
 		if (count != expected) ReturnWithError(MissingData);
-		
-		// convert ROIBlockHeader
-		h.val = __VAL(h.val);
+		h.val = __VAL(h.val); // convert ROIBlockHeader
 	}
 #endif
 	// save header
@@ -570,44 +583,62 @@ void CDecoder::ReadMacroBlock(CMacroBlock* block) THROW_ {
 #endif
 }
 
+#ifdef __PGFROISUPPORT__
 //////////////////////////////////////////////////////////////////////
-// Read next block from stream but don't decode into macro block
-// Encoding scheme: <wordLen>(16 bits) [ ROI ] data
+// Resets stream position to next tile.
+// Used with ROI encoding scheme only.
+// Reads several next blocks from stream but doesn't decode them into macro blocks
+// Encoding scheme: <wordLen>(16 bits) ROI data
 //		ROI	  ::= <bufferSize>(15 bits) <eofTile>(1 bit)
 // It might throw an IOException.
-void CDecoder::SkipTileBuffer() THROW_ {
-	// current block is not used
+void CDecoder::SkipTileBuffer() {
+	ASSERT(m_roi);
+
+	// current macro block belongs to the last tile, so go to the next macro block
 	m_macroBlocksAvailable--;
+	m_currentBlockIndex++;
 
 	// check if pre-decoded data is available
+	while (m_macroBlocksAvailable > 0 && !m_macroBlocks[m_currentBlockIndex]->m_header.rbh.tileEnd) {
+		m_macroBlocksAvailable--;
+		m_currentBlockIndex++;
+	}
 	if (m_macroBlocksAvailable > 0) {
-		m_currentBlock = m_macroBlocks[++m_currentBlockIndex];
+		// set new current macro block
+		m_currentBlock = m_macroBlocks[m_currentBlockIndex];
+		ASSERT(m_currentBlock->m_header.rbh.tileEnd);
 		return;
 	}
-
+	
+	ASSERT(m_macroBlocksAvailable <= 0);
+	m_macroBlocksAvailable = 0;
 	UINT16 wordLen;
+	ROIBlockHeader h(0);
 	int count, expected;
 
-	// read wordLen
-	count = expected = sizeof(wordLen);
-	m_stream->Read(&count, &wordLen); 
-	if (count != expected) ReturnWithError(MissingData);
-	wordLen = __VAL(wordLen);
-	ASSERT(wordLen <= BufferSize);
+	// skips all blocks until tile end
+	do {
+		// read wordLen
+		count = expected = sizeof(wordLen);
+		m_stream->Read(&count, &wordLen);
+		if (count != expected) ReturnWithError(MissingData);
+		wordLen = __VAL(wordLen); // convert wordLen
+		if (wordLen > BufferSize) ReturnWithError(FormatCannotRead);
 
-#ifdef __PGFROISUPPORT__
-	if (m_roi) {
-		// skip ROIBlockHeader
-		m_stream->SetPos(FSFromCurrent, sizeof(ROIBlockHeader));
-	}
-#endif
+		// read ROIBlockHeader
+		count = expected = sizeof(ROIBlockHeader);
+		m_stream->Read(&count, &h.val);
+		if (count != expected) ReturnWithError(MissingData);
+		h.val = __VAL(h.val); // convert ROIBlockHeader
 
-	// skip data
-	m_stream->SetPos(FSFromCurrent, wordLen*WordBytes);
+		// skip data
+		m_stream->SetPos(FSFromCurrent, wordLen*WordBytes);
+	} while (!h.rbh.tileEnd);
 }
+#endif
 
 //////////////////////////////////////////////////////////////////////
-// Decode block into buffer of given size using bit plane coding.
+// Decodes macro block into buffer of given size using bit plane coding.
 // A buffer contains bufferLen UINT32 values, thus, bufferSize bits per bit plane.
 // Following coding scheme is used: 
 //		Buffer		::= <nPlanes>(5 bits) foreach(plane i): Plane[i]  
@@ -619,10 +650,6 @@ void CDecoder::SkipTileBuffer() THROW_ {
 void CDecoder::CMacroBlock::BitplaneDecode() {
 	UINT32 bufferSize = m_header.rbh.bufferSize; ASSERT(bufferSize <= BufferSize);
 
-	UINT32 nPlanes;
-	UINT32 codePos = 0, codeLen, sigLen, sigPos, signLen, signPos;
-	DataT planeMask;
-
 	// clear significance vector
 	for (UINT32 k=0; k < bufferSize; k++) {
 		m_sigFlagVector[k] = false;
@@ -636,15 +663,17 @@ void CDecoder::CMacroBlock::BitplaneDecode() {
 
 	// read number of bit planes
 	// <nPlanes>
-	nPlanes = GetValueBlock(m_codeBuffer, 0, MaxBitPlanesLog); 
-	codePos += MaxBitPlanesLog;
+	UINT32 nPlanes = GetValueBlock(m_codeBuffer, 0, MaxBitPlanesLog); 
+	UINT32 codePos = MaxBitPlanesLog;
 
 	// loop through all bit planes
 	if (nPlanes == 0) nPlanes = MaxBitPlanes + 1;
 	ASSERT(0 < nPlanes && nPlanes <= MaxBitPlanes + 1);
-	planeMask = 1 << (nPlanes - 1);
+	DataT planeMask = 1 << (nPlanes - 1);
 
 	for (int plane = nPlanes - 1; plane >= 0; plane--) {
+		UINT32 sigLen = 0;
+
 		// read RL code
 		if (GetBit(m_codeBuffer, codePos)) {
 			// RL coding of sigBits is used
@@ -652,10 +681,10 @@ void CDecoder::CMacroBlock::BitplaneDecode() {
 			codePos++;
 
 			// read codeLen
-			codeLen = GetValueBlock(m_codeBuffer, codePos, RLblockSizeLen); ASSERT(codeLen <= MaxCodeLen);
+			UINT32 codeLen = GetValueBlock(m_codeBuffer, codePos, RLblockSizeLen); ASSERT(codeLen <= MaxCodeLen);
 
 			// position of encoded sigBits and signBits
-			sigPos = codePos + RLblockSizeLen; ASSERT(sigPos < CodeBufferBitLen); 
+			UINT32 sigPos = codePos + RLblockSizeLen; ASSERT(sigPos < CodeBufferBitLen);
 
 			// refinement bits
 			codePos = AlignWordPos(sigPos + codeLen); ASSERT(codePos < CodeBufferBitLen); 
@@ -680,13 +709,13 @@ void CDecoder::CMacroBlock::BitplaneDecode() {
 				codePos++;
 
 				// read codeLen
-				codeLen = GetValueBlock(m_codeBuffer, codePos, RLblockSizeLen); ASSERT(codeLen <= MaxCodeLen);
+				UINT32 codeLen = GetValueBlock(m_codeBuffer, codePos, RLblockSizeLen); ASSERT(codeLen <= MaxCodeLen);
 
 				// sign bits
-				signPos = codePos + RLblockSizeLen; ASSERT(signPos < CodeBufferBitLen);
+				UINT32 signPos = codePos + RLblockSizeLen; ASSERT(signPos < CodeBufferBitLen);
 				
 				// significant bits
-				sigPos = AlignWordPos(signPos + codeLen); ASSERT(sigPos < CodeBufferBitLen);
+				UINT32 sigPos = AlignWordPos(signPos + codeLen); ASSERT(sigPos < CodeBufferBitLen);
 
 				// refinement bits
 				codePos = AlignWordPos(sigPos + sigLen); ASSERT(codePos < CodeBufferBitLen);
@@ -700,13 +729,13 @@ void CDecoder::CMacroBlock::BitplaneDecode() {
 				codePos++;
 
 				// read signLen
-				signLen = GetValueBlock(m_codeBuffer, codePos, RLblockSizeLen); ASSERT(signLen <= MaxCodeLen);
+				UINT32 signLen = GetValueBlock(m_codeBuffer, codePos, RLblockSizeLen); ASSERT(signLen <= MaxCodeLen);
 				
 				// sign bits
-				signPos = AlignWordPos(codePos + RLblockSizeLen); ASSERT(signPos < CodeBufferBitLen);
+				UINT32 signPos = AlignWordPos(codePos + RLblockSizeLen); ASSERT(signPos < CodeBufferBitLen);
 
 				// significant bits
-				sigPos = AlignWordPos(signPos + signLen); ASSERT(sigPos < CodeBufferBitLen);
+				UINT32 sigPos = AlignWordPos(signPos + signLen); ASSERT(sigPos < CodeBufferBitLen);
 
 				// refinement bits
 				codePos = AlignWordPos(sigPos + sigLen); ASSERT(codePos < CodeBufferBitLen);
@@ -727,7 +756,7 @@ void CDecoder::CMacroBlock::BitplaneDecode() {
 }
 
 ////////////////////////////////////////////////////////////////////
-// Reconstruct bitplane from significant bitset and refinement bitset
+// Reconstructs bitplane from significant bitset and refinement bitset
 // returns length [bits] of sigBits
 // input:  sigBits, refBits, signBits
 // output: m_value
@@ -736,13 +765,11 @@ UINT32 CDecoder::CMacroBlock::ComposeBitplane(UINT32 bufferSize, DataT planeMask
 	ASSERT(refBits);
 	ASSERT(signBits);
 
-	UINT32 valPos = 0, signPos = 0, refPos = 0;
-	UINT32 sigPos = 0, sigEnd;
-	UINT32 zerocnt;
+	UINT32 valPos = 0, signPos = 0, refPos = 0, sigPos = 0;
 
 	while (valPos < bufferSize) {
 		// search next 1 in m_sigFlagVector using searching with sentinel
-		sigEnd = valPos;
+		UINT32 sigEnd = valPos;
 		while(!m_sigFlagVector[sigEnd]) { sigEnd++; }
 		sigEnd -= valPos;
 		sigEnd += sigPos;
@@ -751,7 +778,7 @@ UINT32 CDecoder::CMacroBlock::ComposeBitplane(UINT32 bufferSize, DataT planeMask
 		// these 1's are significant bits
 		while (sigPos < sigEnd) {
 			// search 0's
-			zerocnt = SeekBitRange(sigBits, sigPos, sigEnd - sigPos);
+			UINT32 zerocnt = SeekBitRange(sigBits, sigPos, sigEnd - sigPos);
 			sigPos += zerocnt;
 			valPos += zerocnt;
 			if (sigPos < sigEnd) {
@@ -785,7 +812,7 @@ UINT32 CDecoder::CMacroBlock::ComposeBitplane(UINT32 bufferSize, DataT planeMask
 }
 
 ////////////////////////////////////////////////////////////////////
-// Reconstruct bitplane from significant bitset and refinement bitset
+// Reconstructs bitplane from significant bitset and refinement bitset
 // returns length [bits] of decoded significant bits
 // input:  RL encoded sigBits and signBits in m_codeBuffer, refBits
 // output: m_value
@@ -890,7 +917,7 @@ UINT32 CDecoder::CMacroBlock::ComposeBitplaneRLD(UINT32 bufferSize, DataT planeM
 }
 
 ////////////////////////////////////////////////////////////////////
-// Reconstruct bitplane from significant bitset, refinement bitset, and RL encoded sign bits
+// Reconstructs bitplane from significant bitset, refinement bitset, and RL encoded sign bits
 // returns length [bits] of sigBits
 // input:  sigBits, refBits, RL encoded signBits
 // output: m_value
diff --git a/scribus/third_party/pgf/Decoder.h b/scribus/third_party/pgf/Decoder.h
index ce2531c472ebd2ea42116ab4a7e988f94d489fb7..4271914af04d8854b33a874bf91dabff047b02e0 100644
--- a/scribus/third_party/pgf/Decoder.h
+++ b/scribus/third_party/pgf/Decoder.h
@@ -52,12 +52,9 @@ class CDecoder {
 	public:
 		//////////////////////////////////////////////////////////////////////
 		/// Constructor: Initializes new macro block.
-		/// @param decoder Pointer to outer class.
 		CMacroBlock()
 		: m_header(0)								// makes sure that IsCompletelyRead() returns true for an empty macro block
-#if defined(WIN32) || defined(WINCE) || defined(WIN64)
 #pragma warning( suppress : 4351 )
-#endif
 		, m_value()
 		, m_codeBuffer()
 		, m_valuePos(0)
@@ -102,10 +99,10 @@ public:
 	/// @param levelLength The location of the levelLength array. The array is allocated in this method. The caller has to delete this array.
 	/// @param userDataPos The stream position of the user data (metadata)
 	/// @param useOMP If true, then the decoder will use multi-threading based on openMP
-	/// @param skipUserData If true, then user data is not read. In case of available user data, the file position is still returned in userDataPos.
-	CDecoder(CPGFStream* stream, PGFPreHeader& preHeader, PGFHeader& header, 
+	/// @param userDataPolicy Policy of user data (meta-data) handling while reading PGF headers.
+	CDecoder(CPGFStream* stream, PGFPreHeader& preHeader, PGFHeader& header,
 		     PGFPostHeader& postHeader, UINT32*& levelLength, UINT64& userDataPos, 
-			 bool useOMP, bool skipUserData) THROW_; // throws IOException
+			 bool useOMP, UINT32 userDataPolicy); // throws IOException
 
 	/////////////////////////////////////////////////////////////////////
 	/// Destructor
@@ -122,7 +119,7 @@ public:
 	/// @param height The height of the rectangle
 	/// @param startPos The relative subband position of the top left corner of the rectangular region
 	/// @param pitch The number of bytes in row of the subband
-	void Partition(CSubband* band, int quantParam, int width, int height, int startPos, int pitch) THROW_;
+	void Partition(CSubband* band, int quantParam, int width, int height, int startPos, int pitch);
 
 	/////////////////////////////////////////////////////////////////////
 	/// Deccoding and dequantization of HL and LH subband (interleaved) using partitioning scheme.
@@ -131,25 +128,25 @@ public:
 	/// @param wtChannel A wavelet transform channel containing the HL and HL band
 	/// @param level Wavelet transform level
 	/// @param quantParam Dequantization value
-	void DecodeInterleaved(CWaveletTransform* wtChannel, int level, int quantParam) THROW_;
+	void DecodeInterleaved(CWaveletTransform* wtChannel, int level, int quantParam);
 
 	//////////////////////////////////////////////////////////////////////
-	/// Return the length of all encoded headers in bytes.
+	/// Returns the length of all encoded headers in bytes.
 	/// @return The length of all encoded headers in bytes
 	UINT32 GetEncodedHeaderLength() const			{ return m_encodedHeaderLength; }
 
 	////////////////////////////////////////////////////////////////////
-	/// Reset stream position to beginning of PGF pre-header
-	void SetStreamPosToStart() THROW_				{ ASSERT(m_stream); m_stream->SetPos(FSFromStart, m_startPos); }
+	/// Resets stream position to beginning of PGF pre-header
+	void SetStreamPosToStart()				{ ASSERT(m_stream); m_stream->SetPos(FSFromStart, m_startPos); }
 
 	////////////////////////////////////////////////////////////////////
-	/// Reset stream position to beginning of data block
-	void SetStreamPosToData() THROW_				{ ASSERT(m_stream); m_stream->SetPos(FSFromStart, m_startPos + m_encodedHeaderLength); }
+	/// Resets stream position to beginning of data block
+	void SetStreamPosToData()				{ ASSERT(m_stream); m_stream->SetPos(FSFromStart, m_startPos + m_encodedHeaderLength); }
 
 	////////////////////////////////////////////////////////////////////
-	/// Skip a given number of bytes in the open stream.
+	/// Skips a given number of bytes in the open stream.
 	/// It might throw an IOException.
-	void Skip(UINT64 offset) THROW_;
+	void Skip(UINT64 offset);
 
 	/////////////////////////////////////////////////////////////////////
 	/// Dequantization of a single value at given position in subband.
@@ -157,7 +154,7 @@ public:
 	/// @param band A subband
 	/// @param bandPos A valid position in subband band
 	/// @param quantParam The quantization parameter
-	void DequantizeValue(CSubband* band, UINT32 bandPos, int quantParam) THROW_;
+	void DequantizeValue(CSubband* band, UINT32 bandPos, int quantParam);
 
 	//////////////////////////////////////////////////////////////////////
 	/// Copies data from the open stream to a target buffer.
@@ -165,31 +162,28 @@ public:
 	/// @param target The target buffer
 	/// @param len The number of bytes to read
 	/// @return The number of bytes copied to the target buffer
-	UINT32 ReadEncodedData(UINT8* target, UINT32 len) const THROW_;
+	UINT32 ReadEncodedData(UINT8* target, UINT32 len) const;
 
 	/////////////////////////////////////////////////////////////////////
-	/// Reads stream and decodes tile buffer
+	/// Reads next block(s) from stream and decodes them
 	/// It might throw an IOException.
-	void DecodeBuffer() THROW_;
+	void DecodeBuffer();
 
 	/////////////////////////////////////////////////////////////////////
 	/// @return Stream
 	CPGFStream* GetStream()							{ return m_stream; }
 
 	/////////////////////////////////////////////////////////////////////
-	/// @return True if decoded macro blocks are available for processing
-	bool MacroBlocksAvailable() const				{ return m_macroBlocksAvailable > 1; }
-
-#ifdef __PGFROISUPPORT__
-	/////////////////////////////////////////////////////////////////////
-	/// Reads stream and decodes tile buffer
+	/// Gets next macro block
 	/// It might throw an IOException.
-	void DecodeTileBuffer() THROW_;
+	void GetNextMacroBlock();
 
+#ifdef __PGFROISUPPORT__
 	/////////////////////////////////////////////////////////////////////
 	/// Resets stream position to next tile.
+	/// Used with ROI encoding scheme only.
 	/// It might throw an IOException.
-	void SkipTileBuffer() THROW_;
+	void SkipTileBuffer();
 
 	/////////////////////////////////////////////////////////////////////
 	/// Enables region of interest (ROI) status.
@@ -201,7 +195,7 @@ public:
 #endif
 
 private:
-	void ReadMacroBlock(CMacroBlock* block) THROW_; ///< throws IOException
+	void ReadMacroBlock(CMacroBlock* block); ///< throws IOException
 
 	CPGFStream *m_stream;						///< input PGF stream
 	UINT64 m_startPos;							///< stream position at the beginning of the PGF pre-header
diff --git a/scribus/third_party/pgf/Encoder.cpp b/scribus/third_party/pgf/Encoder.cpp
index d3664a8d6a62f3b265e1ac1ec2048f62ce204b3b..9e9754271733e9f42eab33b9bc91a656bb9f102f 100644
--- a/scribus/third_party/pgf/Encoder.cpp
+++ b/scribus/third_party/pgf/Encoder.cpp
@@ -34,7 +34,7 @@
 //////////////////////////////////////////////////////
 // PGF: file structure
 //
-// PGFPreHeader PGFHeader PGFPostHeader LevelLengths Level_n-1 Level_n-2 ... Level_0
+// PGFPreHeader PGFHeader [PGFPostHeader] LevelLengths Level_n-1 Level_n-2 ... Level_0
 // PGFPostHeader ::= [ColorTable] [UserData]
 // LevelLengths  ::= UINT32[nLevels]
 
@@ -67,7 +67,7 @@
 /// @param postHeader [in] An already filled in PGF post-header (containing color table, user data, ...)
 /// @param userDataPos [out] File position of user data
 /// @param useOMP If true, then the encoder will use multi-threading based on openMP
-CEncoder::CEncoder(CPGFStream* stream, PGFPreHeader preHeader, PGFHeader header, const PGFPostHeader& postHeader, UINT64& userDataPos, bool useOMP) THROW_
+CEncoder::CEncoder(CPGFStream* stream, PGFPreHeader preHeader, PGFHeader header, const PGFPostHeader& postHeader, UINT64& userDataPos, bool useOMP)
 : m_stream(stream)
 , m_bufferStartPos(0)
 , m_currLevelIndex(0)
@@ -82,7 +82,7 @@ CEncoder::CEncoder(CPGFStream* stream, PGFPreHeader preHeader, PGFHeader header,
 
 	int count;
 	m_lastMacroBlock = 0;
-	m_levelLength = NULL;
+	m_levelLength = nullptr;
 
 	// set number of threads
 #ifdef LIBPGF_USE_OPENMP
@@ -157,12 +157,12 @@ CEncoder::~CEncoder() {
 /// Increase post-header size and write new size into stream.
 /// @param preHeader An already filled in PGF pre-header
 /// It might throw an IOException.
-void CEncoder::UpdatePostHeaderSize(PGFPreHeader preHeader) THROW_ {
+void CEncoder::UpdatePostHeaderSize(PGFPreHeader preHeader) {
 	UINT64 curPos = m_stream->GetPos(); // end of user data
 	int count = PreHeaderSize;
 
 	// write preHeader
-	m_stream->SetPos(FSFromStart, m_startPosition);
+	SetStreamPosToStart();
 	preHeader.hSize = __VAL(preHeader.hSize);
 	m_stream->Write(&count, &preHeader);
 
@@ -174,7 +174,7 @@ void CEncoder::UpdatePostHeaderSize(PGFPreHeader preHeader) THROW_ {
 /// It might throw an IOException.
 /// @param levelLength A reference to an integer array, large enough to save the relative file positions of all PGF levels
 /// @return number of bytes written into stream
-UINT32 CEncoder::WriteLevelLength(UINT32*& levelLength) THROW_ {
+UINT32 CEncoder::WriteLevelLength(UINT32*& levelLength) {
 	// renew levelLength
 	delete[] levelLength;
 	levelLength = new(std::nothrow) UINT32[m_nLevels];
@@ -199,7 +199,7 @@ UINT32 CEncoder::WriteLevelLength(UINT32*& levelLength) THROW_ {
 /// Write new levelLength into stream.
 /// It might throw an IOException.
 /// @return Written image bytes.
-UINT32 CEncoder::UpdateLevelLength() THROW_ {
+UINT32 CEncoder::UpdateLevelLength() {
 	UINT64 curPos = m_stream->GetPos(); // end of image
 
 	// set file pos to levelLength
@@ -243,7 +243,7 @@ UINT32 CEncoder::UpdateLevelLength() THROW_ {
 /// @param height The height of the rectangle
 /// @param startPos The absolute subband position of the top left corner of the rectangular region
 /// @param pitch The number of bytes in row of the subband
-void CEncoder::Partition(CSubband* band, int width, int height, int startPos, int pitch) THROW_ {
+void CEncoder::Partition(CSubband* band, int width, int height, int startPos, int pitch) {
 	ASSERT(band);
 
 	const div_t hh = div(height, LinBlockSize);
@@ -307,7 +307,7 @@ void CEncoder::Partition(CSubband* band, int width, int height, int startPos, in
 //////////////////////////////////////////////////////
 /// Pad buffer with zeros and encode buffer.
 /// It might throw an IOException.
-void CEncoder::Flush() THROW_ {
+void CEncoder::Flush() {
 	if (m_currentBlock->m_valuePos > 0) {
 		// pad buffer with zeros
 		memset(&(m_currentBlock->m_value[m_currentBlock->m_valuePos]), 0, (BufferSize - m_currentBlock->m_valuePos)*DataTSize);
@@ -323,7 +323,7 @@ void CEncoder::Flush() THROW_ {
 // Stores band value from given position bandPos into buffer m_value at position m_valuePos
 // If buffer is full encode it to file
 // It might throw an IOException.
-void CEncoder::WriteValue(CSubband* band, int bandPos) THROW_ {
+void CEncoder::WriteValue(CSubband* band, int bandPos) {
 	if (m_currentBlock->m_valuePos == BufferSize) {
 		EncodeBuffer(ROIBlockHeader(BufferSize, false));
 	}
@@ -338,7 +338,7 @@ void CEncoder::WriteValue(CSubband* band, int bandPos) THROW_ {
 // Encoding scheme: <wordLen>(16 bits) [ ROI ] data
 //		ROI	  ::= <bufferSize>(15 bits) <eofTile>(1 bit)
 // It might throw an IOException.
-void CEncoder::EncodeBuffer(ROIBlockHeader h) THROW_ {
+void CEncoder::EncodeBuffer(ROIBlockHeader h) {
 	ASSERT(m_currentBlock);
 #ifdef __PGFROISUPPORT__
 	ASSERT(m_roi && h.rbh.bufferSize <= BufferSize || h.rbh.bufferSize == BufferSize);
@@ -403,7 +403,7 @@ void CEncoder::EncodeBuffer(ROIBlockHeader h) THROW_ {
 /////////////////////////////////////////////////////////////////////
 // Write encoded macro block into stream.
 // It might throw an IOException.
-void CEncoder::WriteMacroBlock(CMacroBlock* block) THROW_ {
+void CEncoder::WriteMacroBlock(CMacroBlock* block) {
 	ASSERT(block);
 #ifdef __PGFROISUPPORT__
 	ROIBlockHeader h = block->m_header;
@@ -424,8 +424,9 @@ void CEncoder::WriteMacroBlock(CMacroBlock* block) THROW_ {
 #ifdef __PGFROISUPPORT__
 	// write ROIBlockHeader
 	if (m_roi) {
+		count = sizeof(ROIBlockHeader);
 		h.val = __VAL(h.val);
-		m_stream->Write(&count, &h.val); ASSERT(count == sizeof(UINT16));
+		m_stream->Write(&count, &h.val); ASSERT(count == sizeof(ROIBlockHeader));
 	}
 #endif // __PGFROISUPPORT__
 
@@ -440,7 +441,8 @@ void CEncoder::WriteMacroBlock(CMacroBlock* block) THROW_ {
 #ifdef __PGFROISUPPORT__
 	// write ROIBlockHeader
 	if (m_roi) {
-		m_stream->Write(&count, &h.val); ASSERT(count == sizeof(UINT16));
+		count = sizeof(ROIBlockHeader);
+		m_stream->Write(&count, &h.val); ASSERT(count == sizeof(ROIBlockHeader));
 	}
 #endif // __PGFROISUPPORT__
 #endif // PGF_USE_BIG_ENDIAN
diff --git a/scribus/third_party/pgf/Encoder.h b/scribus/third_party/pgf/Encoder.h
index 64ef4e3ff8f78823288375306533944bf277e683..37885f10d6932d31a1ad51fc2c5c2bd6e835301e 100644
--- a/scribus/third_party/pgf/Encoder.h
+++ b/scribus/third_party/pgf/Encoder.h
@@ -54,9 +54,7 @@ class CEncoder {
 		/// Constructor: Initializes new macro block.
 		/// @param encoder Pointer to outer class.
 		CMacroBlock(CEncoder *encoder)
-#if defined(WIN32) || defined(WINCE) || defined(WIN64)
 #pragma warning( suppress : 4351 )
-#endif
 		: m_value()
 		, m_codeBuffer()
 		, m_header(0)
@@ -112,7 +110,7 @@ public:
 	/// @param userDataPos [out] File position of user data
 	/// @param useOMP If true, then the encoder will use multi-threading based on openMP
 	CEncoder(CPGFStream* stream, PGFPreHeader preHeader, PGFHeader header, const PGFPostHeader& postHeader, 
-		UINT64& userDataPos, bool useOMP) THROW_; // throws IOException
+		UINT64& userDataPos, bool useOMP); // throws IOException
 
 	/////////////////////////////////////////////////////////////////////
 	/// Destructor
@@ -125,26 +123,26 @@ public:
 	/////////////////////////////////////////////////////////////////////
 	/// Pad buffer with zeros and encode buffer.
 	/// It might throw an IOException.
-	void Flush() THROW_;
+	void Flush();
 
 	/////////////////////////////////////////////////////////////////////
 	/// Increase post-header size and write new size into stream.
 	/// @param preHeader An already filled in PGF pre-header
 	/// It might throw an IOException.
-	void UpdatePostHeaderSize(PGFPreHeader preHeader) THROW_;
+	void UpdatePostHeaderSize(PGFPreHeader preHeader);
 
 	/////////////////////////////////////////////////////////////////////
 	/// Create level length data structure and write a place holder into stream.
 	/// It might throw an IOException.
 	/// @param levelLength A reference to an integer array, large enough to save the relative file positions of all PGF levels
 	/// @return number of bytes written into stream
-	UINT32 WriteLevelLength(UINT32*& levelLength) THROW_;
+	UINT32 WriteLevelLength(UINT32*& levelLength);
 
 	/////////////////////////////////////////////////////////////////////
 	/// Write new levelLength into stream.
 	/// It might throw an IOException.
 	/// @return Written image bytes.
-	UINT32 UpdateLevelLength() THROW_;
+	UINT32 UpdateLevelLength();
 
 	/////////////////////////////////////////////////////////////////////
 	/// Partitions a rectangular region of a given subband.
@@ -156,7 +154,7 @@ public:
 	/// @param height The height of the rectangle
 	/// @param startPos The absolute subband position of the top left corner of the rectangular region
 	/// @param pitch The number of bytes in row of the subband
-	void Partition(CSubband* band, int width, int height, int startPos, int pitch) THROW_;
+	void Partition(CSubband* band, int width, int height, int startPos, int pitch);
 
 	/////////////////////////////////////////////////////////////////////
 	/// Informs the encoder about the encoded level. 
@@ -168,7 +166,7 @@ public:
 	/// It might throw an IOException.
 	/// @param band A subband
 	/// @param bandPos A valid position in subband band
-	void WriteValue(CSubband* band, int bandPos) THROW_;
+	void WriteValue(CSubband* band, int bandPos);
 
 	/////////////////////////////////////////////////////////////////////
 	/// Compute stream length of header.
@@ -185,6 +183,10 @@ public:
 	/// @return file offset
 	INT64 ComputeOffset() const { return m_stream->GetPos() - m_levelLengthPos; }
 
+	////////////////////////////////////////////////////////////////////
+	/// Resets stream position to beginning of PGF pre-header
+	void SetStreamPosToStart() { ASSERT(m_stream); m_stream->SetPos(FSFromStart, m_startPosition); }
+
 	/////////////////////////////////////////////////////////////////////
 	/// Save current stream position as beginning of current level.
 	void SetBufferStartPos() { m_bufferStartPos = m_stream->GetPos(); }
@@ -193,7 +195,7 @@ public:
 	/////////////////////////////////////////////////////////////////////
 	/// Encodes tile buffer and writes it into stream
 	/// It might throw an IOException.
-	void EncodeTileBuffer() THROW_	{ ASSERT(m_currentBlock && m_currentBlock->m_valuePos >= 0 && m_currentBlock->m_valuePos <= BufferSize); EncodeBuffer(ROIBlockHeader(m_currentBlock->m_valuePos, true)); }
+	void EncodeTileBuffer()	{ ASSERT(m_currentBlock && m_currentBlock->m_valuePos >= 0 && m_currentBlock->m_valuePos <= BufferSize); EncodeBuffer(ROIBlockHeader(m_currentBlock->m_valuePos, true)); }
 
 	/////////////////////////////////////////////////////////////////////
 	/// Enables region of interest (ROI) status.
@@ -205,8 +207,8 @@ public:
 #endif
 
 private:
-	void EncodeBuffer(ROIBlockHeader h) THROW_; // throws IOException
-	void WriteMacroBlock(CMacroBlock* block) THROW_; // throws IOException
+	void EncodeBuffer(ROIBlockHeader h); // throws IOException
+	void WriteMacroBlock(CMacroBlock* block); // throws IOException
 
 	CPGFStream *m_stream;						///< output PMF stream
 	UINT64	m_startPosition;					///< stream position of PGF start (PreHeader)
diff --git a/scribus/third_party/pgf/PGFimage.cpp b/scribus/third_party/pgf/PGFimage.cpp
index 3cafb886d8f5084069927162dd845092e46ca2af..2fb790f73fe7a8841141e2ad64ed8413e60929f7 100644
--- a/scribus/third_party/pgf/PGFimage.cpp
+++ b/scribus/third_party/pgf/PGFimage.cpp
@@ -29,6 +29,7 @@
 #include "PGFimage.h"
 #include "Decoder.h"
 #include "Encoder.h"
+#include "BitStream.h"
 #include <cmath>
 #include <cstring>
 
@@ -50,28 +51,43 @@
 	}
 #endif
 
+#ifdef _DEBUG
+	// allows RGB and RGBA image visualization inside Visual Studio Debugger
+	struct DebugBGRImage {
+		int width, height, pitch;
+		BYTE *data;
+	} roiimage;
+#endif
+
+//////////////////////////////////////////////////////////////////////
+// Standard constructor
+CPGFImage::CPGFImage() {
+	Init();
+}
+
 //////////////////////////////////////////////////////////////////////
-// Standard constructor: It is used to create a PGF instance for opening and reading.
-CPGFImage::CPGFImage() 
-: m_decoder(0)
-, m_encoder(0)
-, m_levelLength(0)
-, m_userDataPos(0)
-, m_currentLevel(0)
-, m_quant(0)
-, m_downsample(false)
-, m_favorSpeedOverSize(false)
-, m_useOMPinEncoder(true)
-, m_useOMPinDecoder(true)
-, m_skipUserData(false)
+void CPGFImage::Init() {
+	// init pointers
+	m_decoder = nullptr;
+	m_encoder = nullptr;
+	m_levelLength = nullptr;
+
+	// init members
 #ifdef __PGFROISUPPORT__
-, m_streamReinitialized(false)
+	m_streamReinitialized = false;
 #endif
-, m_cb(0)
-, m_cbArg(0)
-, m_percent(0)
-, m_progressMode(PM_Relative)
-{
+	m_currentLevel = 0;
+	m_quant = 0;
+	m_userDataPos = 0;
+	m_downsample = false;
+	m_favorSpeedOverSize = false;
+	m_useOMPinEncoder = true;
+	m_useOMPinDecoder = true;
+	m_cb = nullptr;
+	m_cbArg = nullptr;
+	m_progressMode = PM_Relative;
+	m_percent = 0;
+	m_userDataPolicy = UP_CacheAll;
 
 	// init preHeader
 	memcpy(m_preHeader.magic, PGFMagic, 3);
@@ -79,48 +95,42 @@ CPGFImage::CPGFImage()
 	m_preHeader.hSize = 0;
 
 	// init postHeader
-	m_postHeader.userData = 0;
+	m_postHeader.userData = nullptr;
 	m_postHeader.userDataLen = 0;
+	m_postHeader.cachedUserDataLen = 0;
 
 	// init channels
-	for (int i=0; i < MaxChannels; i++) {
-		m_channel[i] = 0;
-		m_wtChannel[i] = 0;
+	for (int i = 0; i < MaxChannels; i++) {
+		m_channel[i] = nullptr;
+		m_wtChannel[i] = nullptr;
 	}
 
 	// set image width and height
-	m_width[0] = 0;
-	m_height[0] = 0;
+	for (int i = 0; i < MaxChannels; i++) {
+		m_width[0] = 0;
+		m_height[0] = 0;
+	}
 }
 
 //////////////////////////////////////////////////////////////////////
 // Destructor: Destroy internal data structures.
 CPGFImage::~CPGFImage() {
+	m_currentLevel = -100; // unusual value used as marker in Destroy()
 	Destroy();
 }
 
 //////////////////////////////////////////////////////////////////////
-// Destroy internal data structures.
-// Destructor calls this method during destruction.
+// Destroy internal data structures. Object state after this is the same as after CPGFImage().
 void CPGFImage::Destroy() {
-	Close();
-
-	for (int i=0; i < m_header.channels; i++) {
-		delete m_wtChannel[i]; m_wtChannel[i]=0; // also deletes m_channel
-		m_channel[i] = 0;
+	for (int i = 0; i < m_header.channels; i++) {
+		delete m_wtChannel[i]; // also deletes m_channel
 	}
-	delete[] m_postHeader.userData; m_postHeader.userData = 0; m_postHeader.userDataLen = 0;
-	delete[] m_levelLength; m_levelLength = 0;
-	delete m_encoder; m_encoder = NULL;
-	
-	m_userDataPos = 0;
-}
+	delete[] m_postHeader.userData; 
+	delete[] m_levelLength;
+	delete m_decoder;
+	delete m_encoder;
 
-//////////////////////////////////////////////////////////////////////
-// Close PGF image after opening and reading.
-// Destructor calls this method during destruction.
-void CPGFImage::Close() {
-	delete m_decoder; m_decoder = 0;
+	if (m_currentLevel != -100) Init();
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -128,12 +138,12 @@ void CPGFImage::Close() {
 // Precondition: The stream has been opened for reading.
 // It might throw an IOException.
 // @param stream A PGF stream
-void CPGFImage::Open(CPGFStream *stream) THROW_ {
+void CPGFImage::Open(CPGFStream *stream) {
 	ASSERT(stream);
 
 	// create decoder and read PGFPreHeader PGFHeader PGFPostHeader LevelLengths
 	m_decoder = new CDecoder(stream, m_preHeader, m_header, m_postHeader, m_levelLength, 
-		m_userDataPos, m_useOMPinDecoder, m_skipUserData);
+		m_userDataPos, m_useOMPinDecoder, m_userDataPolicy);
 
 	if (m_header.nLevels > MaxLevel) ReturnWithError(FormatCannotRead);
 
@@ -145,7 +155,7 @@ void CPGFImage::Open(CPGFStream *stream) THROW_ {
 	m_height[0] = m_header.height;
 
 	// complete header
-	CompleteHeader();
+	if (!CompleteHeader()) ReturnWithError(FormatCannotRead);
 
 	// interpret quant parameter
 	if (m_header.quality > DownsampleThreshold && 
@@ -166,8 +176,8 @@ void CPGFImage::Open(CPGFStream *stream) THROW_ {
 	// set channel dimensions (chrominance is subsampled by factor 2)
 	if (m_downsample) {
 		for (int i=1; i < m_header.channels; i++) {
-			m_width[i] = (m_width[0] + 1)/2;
-			m_height[i] = (m_height[0] + 1)/2;
+			m_width[i] = (m_width[0] + 1) >> 1;
+			m_height[i] = (m_height[0] + 1) >> 1;
 		}
 	} else {
 		for (int i=1; i < m_header.channels; i++) {
@@ -205,7 +215,10 @@ void CPGFImage::Open(CPGFStream *stream) THROW_ {
 }
 
 ////////////////////////////////////////////////////////////
-void CPGFImage::CompleteHeader() {
+bool CPGFImage::CompleteHeader() {
+	// set current codec version
+	m_header.version = PGFVersionNumber(PGFMajorNumber, PGFYear, PGFWeek);
+
 	if (m_header.mode == ImageModeUnknown) {
 		// undefined mode
 		switch(m_header.bpp) {
@@ -261,20 +274,20 @@ void CPGFImage::CompleteHeader() {
 		// change mode
 		m_header.mode = ImageModeRGBA;
 	}
-	ASSERT(m_header.mode != ImageModeBitmap || m_header.bpp == 1);
-	ASSERT(m_header.mode != ImageModeIndexedColor || m_header.bpp == 8);
-	ASSERT(m_header.mode != ImageModeGrayScale || m_header.bpp == 8);
-	ASSERT(m_header.mode != ImageModeGray16 || m_header.bpp == 16);
-	ASSERT(m_header.mode != ImageModeGray32 || m_header.bpp == 32);
-	ASSERT(m_header.mode != ImageModeRGBColor || m_header.bpp == 24);
-	ASSERT(m_header.mode != ImageModeRGBA || m_header.bpp == 32);
-	ASSERT(m_header.mode != ImageModeRGB12 || m_header.bpp == 12);
-	ASSERT(m_header.mode != ImageModeRGB16 || m_header.bpp == 16);
-	ASSERT(m_header.mode != ImageModeRGB48 || m_header.bpp == 48);
-	ASSERT(m_header.mode != ImageModeLabColor || m_header.bpp == 24);
-	ASSERT(m_header.mode != ImageModeLab48 || m_header.bpp == 48);
-	ASSERT(m_header.mode != ImageModeCMYKColor || m_header.bpp == 32);
-	ASSERT(m_header.mode != ImageModeCMYK64 || m_header.bpp == 64);
+	if (m_header.mode == ImageModeBitmap && m_header.bpp != 1) return false;
+	if (m_header.mode == ImageModeIndexedColor && m_header.bpp != 8) return false;
+	if (m_header.mode == ImageModeGrayScale && m_header.bpp != 8) return false;
+	if (m_header.mode == ImageModeGray16 && m_header.bpp != 16) return false;
+	if (m_header.mode == ImageModeGray32 && m_header.bpp != 32) return false;
+	if (m_header.mode == ImageModeRGBColor && m_header.bpp != 24) return false;
+	if (m_header.mode == ImageModeRGBA && m_header.bpp != 32) return false;
+	if (m_header.mode == ImageModeRGB12 && m_header.bpp != 12) return false;
+	if (m_header.mode == ImageModeRGB16 && m_header.bpp != 16) return false;
+	if (m_header.mode == ImageModeRGB48 && m_header.bpp != 48) return false;
+	if (m_header.mode == ImageModeLabColor && m_header.bpp != 24) return false;
+	if (m_header.mode == ImageModeLab48 && m_header.bpp != 48) return false;
+	if (m_header.mode == ImageModeCMYKColor && m_header.bpp != 32) return false;
+	if (m_header.mode == ImageModeCMYK64 && m_header.bpp != 64) return false;
 
 	// set number of channels
 	if (!m_header.channels) {
@@ -300,8 +313,7 @@ void CPGFImage::CompleteHeader() {
 			m_header.channels = 4;
 			break;
 		default:
-			ASSERT(false);
-			m_header.channels = 3;
+			return false;
 		}
 	}
 
@@ -311,15 +323,20 @@ void CPGFImage::CompleteHeader() {
 	if (!m_header.usedBitsPerChannel || m_header.usedBitsPerChannel > bpc) {
 		m_header.usedBitsPerChannel = bpc;
 	}
+
+	return true;
 }
 
 //////////////////////////////////////////////////////////////////////
 /// Return user data and size of user data.
 /// Precondition: The PGF image has been opened with a call of Open(...).
-/// @param size [out] Size of user data in bytes.
-/// @return A pointer to user data or NULL if there is no user data.
-const UINT8* CPGFImage::GetUserData(UINT32& size) const {
-	size = m_postHeader.userDataLen;
+/// In an encoder scenario don't call this method before WriteHeader().
+/// @param cachedSize [out] Size of returned user data in bytes.
+/// @param pTotalSize [optional out] Pointer to return the size of user data stored in image header in bytes.
+/// @return A pointer to user data or nullptr if there is no user data available.
+const UINT8* CPGFImage::GetUserData(UINT32& cachedSize, UINT32* pTotalSize /*= nullptr*/) const {
+	cachedSize = m_postHeader.cachedUserDataLen;
+	if (pTotalSize) *pTotalSize = m_postHeader.userDataLen;
 	return m_postHeader.userData;
 }
 
@@ -328,7 +345,7 @@ const UINT8* CPGFImage::GetUserData(UINT32& size) const {
 /// to get a quick reconstruction (coded -> decoded image).
 /// It might throw an IOException.
 /// @param level The image level of the resulting image in the internal image buffer.
-void CPGFImage::Reconstruct(int level /*= 0*/) THROW_ {
+void CPGFImage::Reconstruct(int level /*= 0*/) {
 	if (m_header.nLevels == 0) {
 		// image didn't use wavelet transform
 		if (level == 0) {
@@ -340,10 +357,12 @@ void CPGFImage::Reconstruct(int level /*= 0*/) THROW_ {
 	} else {
 		int currentLevel = m_header.nLevels;
 
+	#ifdef __PGFROISUPPORT__
 		if (ROIisSupported()) {
 			// enable ROI reading
 			SetROI(PGFRect(0, 0, m_header.width, m_header.height));
 		}
+	#endif
 
 		while (currentLevel > level) {
 			for (int i=0; i < m_header.channels; i++) {
@@ -380,7 +399,7 @@ void CPGFImage::Reconstruct(int level /*= 0*/) THROW_ {
 // @param level The image level of the resulting image in the internal image buffer.
 // @param cb A pointer to a callback procedure. The procedure is called after reading a single level. If cb returns true, then it stops proceeding.
 // @param data Data Pointer to C++ class container to host callback procedure.
-void CPGFImage::Read(int level /*= 0*/, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) THROW_ {
+void CPGFImage::Read(int level /*= 0*/, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) {
 	ASSERT((level >= 0 && level < m_header.nLevels) || m_header.nLevels == 0); // m_header.nLevels == 0: image didn't use wavelet transform
 	ASSERT(m_decoder);
 
@@ -408,21 +427,23 @@ void CPGFImage::Read(int level /*= 0*/, CallbackPtr cb /*= NULL*/, void *data /*
 		// encoding scheme without ROI
 		while (m_currentLevel > level) {
 			for (int i=0; i < m_header.channels; i++) {
-				ASSERT(m_wtChannel[i]);
+				CWaveletTransform* wtChannel = m_wtChannel[i];
+				ASSERT(wtChannel);
+
 				// decode file and write stream to m_wtChannel
 				if (m_currentLevel == m_header.nLevels) { 
 					// last level also has LL band
-					m_wtChannel[i]->GetSubband(m_currentLevel, LL)->PlaceTile(*m_decoder, m_quant);
+					wtChannel->GetSubband(m_currentLevel, LL)->PlaceTile(*m_decoder, m_quant);
 				}
 				if (m_preHeader.version & Version5) {
 					// since version 5
-					m_wtChannel[i]->GetSubband(m_currentLevel, HL)->PlaceTile(*m_decoder, m_quant);
-					m_wtChannel[i]->GetSubband(m_currentLevel, LH)->PlaceTile(*m_decoder, m_quant);
+					wtChannel->GetSubband(m_currentLevel, HL)->PlaceTile(*m_decoder, m_quant);
+					wtChannel->GetSubband(m_currentLevel, LH)->PlaceTile(*m_decoder, m_quant);
 				} else {
 					// until version 4
-					m_decoder->DecodeInterleaved(m_wtChannel[i], m_currentLevel, m_quant);
+					m_decoder->DecodeInterleaved(wtChannel, m_currentLevel, m_quant);
 				}
-				m_wtChannel[i]->GetSubband(m_currentLevel, HH)->PlaceTile(*m_decoder, m_quant);
+				wtChannel->GetSubband(m_currentLevel, HH)->PlaceTile(*m_decoder, m_quant);
 			}
 
 			volatile OSError error = NoError; // volatile prevents optimizations
@@ -453,22 +474,19 @@ void CPGFImage::Read(int level /*= 0*/, CallbackPtr cb /*= NULL*/, void *data /*
 			}
 		}
 	}
-
-	// automatically closing
-	if (m_currentLevel == 0) Close();
 }
 
 #ifdef __PGFROISUPPORT__
 //////////////////////////////////////////////////////////////////////
-/// Read a rectangular region of interest of a PGF image at current stream position.
+/// Read and decode rectangular region of interest (ROI) of a PGF image at current stream position.
 /// The origin of the coordinate axis is the top-left corner of the image.
 /// All coordinates are measured in pixels.
 /// It might throw an IOException.
-/// @param rect [inout] Rectangular region of interest (ROI). The rect might be cropped.
+/// @param rect [inout] Rectangular region of interest (ROI) at level 0. The rect might be cropped.
 /// @param level The image level of the resulting image in the internal image buffer.
 /// @param cb A pointer to a callback procedure. The procedure is called after reading a single level. If cb returns true, then it stops proceeding.
 /// @param data Data Pointer to C++ class container to host callback procedure.
-void CPGFImage::Read(PGFRect& rect, int level /*= 0*/, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) THROW_ {
+void CPGFImage::Read(PGFRect& rect, int level /*= 0*/, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) {
 	ASSERT((level >= 0 && level < m_header.nLevels) || m_header.nLevels == 0); // m_header.nLevels == 0: image didn't use wavelet transform
 	ASSERT(m_decoder);
 
@@ -481,6 +499,10 @@ void CPGFImage::Read(PGFRect& rect, int level /*= 0*/, CallbackPtr cb /*= NULL*/
 		// new encoding scheme supporting ROI
 		ASSERT(rect.left < m_header.width && rect.top < m_header.height);
 
+		// check rectangle
+		if (rect.right == 0 || rect.right > m_header.width) rect.right = m_header.width;
+		if (rect.bottom == 0 || rect.bottom > m_header.height) rect.bottom = m_header.height;
+
 		const int levelDiff = m_currentLevel - level;
 		double percent = (m_progressMode == PM_Relative) ? pow(0.25, levelDiff) : m_percent;
 		
@@ -491,35 +513,31 @@ void CPGFImage::Read(PGFRect& rect, int level /*= 0*/, CallbackPtr cb /*= NULL*/
 			m_decoder->SetStreamPosToData();
 		}
 
-		// check rectangle
-		if (rect.right == 0 || rect.right > m_header.width) rect.right = m_header.width;
-		if (rect.bottom == 0 || rect.bottom > m_header.height) rect.bottom = m_header.height;
-		
 		// enable ROI decoding and reading
 		SetROI(rect);
 
 		while (m_currentLevel > level) {
 			for (int i=0; i < m_header.channels; i++) {
-				ASSERT(m_wtChannel[i]);
+				CWaveletTransform* wtChannel = m_wtChannel[i];
+				ASSERT(wtChannel);
 
 				// get number of tiles and tile indices
-				const UINT32 nTiles = m_wtChannel[i]->GetNofTiles(m_currentLevel);
-				const PGFRect& tileIndices = m_wtChannel[i]->GetTileIndices(m_currentLevel);
+				const UINT32 nTiles = wtChannel->GetNofTiles(m_currentLevel); // independent of ROI
 
 				// decode file and write stream to m_wtChannel
 				if (m_currentLevel == m_header.nLevels) { // last level also has LL band
 					ASSERT(nTiles == 1);
-					m_decoder->DecodeTileBuffer();
-					m_wtChannel[i]->GetSubband(m_currentLevel, LL)->PlaceTile(*m_decoder, m_quant);
+					m_decoder->GetNextMacroBlock();
+					wtChannel->GetSubband(m_currentLevel, LL)->PlaceTile(*m_decoder, m_quant);
 				}
 				for (UINT32 tileY=0; tileY < nTiles; tileY++) {
 					for (UINT32 tileX=0; tileX < nTiles; tileX++) {
 						// check relevance of tile
-						if (tileIndices.IsInside(tileX, tileY)) {
-							m_decoder->DecodeTileBuffer();
-							m_wtChannel[i]->GetSubband(m_currentLevel, HL)->PlaceTile(*m_decoder, m_quant, true, tileX, tileY);
-							m_wtChannel[i]->GetSubband(m_currentLevel, LH)->PlaceTile(*m_decoder, m_quant, true, tileX, tileY);
-							m_wtChannel[i]->GetSubband(m_currentLevel, HH)->PlaceTile(*m_decoder, m_quant, true, tileX, tileY);
+						if (wtChannel->TileIsRelevant(m_currentLevel, tileX, tileY)) {
+							m_decoder->GetNextMacroBlock();
+							wtChannel->GetSubband(m_currentLevel, HL)->PlaceTile(*m_decoder, m_quant, true, tileX, tileY);
+							wtChannel->GetSubband(m_currentLevel, LH)->PlaceTile(*m_decoder, m_quant, true, tileX, tileY);
+							wtChannel->GetSubband(m_currentLevel, HH)->PlaceTile(*m_decoder, m_quant, true, tileX, tileY);
 						} else {
 							// skip tile
 							m_decoder->SkipTileBuffer();
@@ -556,17 +574,48 @@ void CPGFImage::Read(PGFRect& rect, int level /*= 0*/, CallbackPtr cb /*= NULL*/
 			}
 		}
 	}
+}
 
-	// automatically closing
-	if (m_currentLevel == 0) Close();
+//////////////////////////////////////////////////////////////////////
+/// Return ROI of channel 0 at current level in pixels.
+/// The returned rect is only valid after reading a ROI.
+/// @return ROI in pixels
+PGFRect CPGFImage::ComputeLevelROI() const {
+	if (m_currentLevel == 0) {
+		return m_roi;
+	} else {
+		const UINT32 rLeft = LevelSizeL(m_roi.left, m_currentLevel);
+		const UINT32 rRight = LevelSizeL(m_roi.right, m_currentLevel);
+		const UINT32 rTop = LevelSizeL(m_roi.top, m_currentLevel);
+		const UINT32 rBottom = LevelSizeL(m_roi.bottom, m_currentLevel);
+		return PGFRect(rLeft, rTop, rRight - rLeft, rBottom - rTop);
+	}
 }
 
 //////////////////////////////////////////////////////////////////////
-/// Compute ROIs for each channel and each level
-/// @param rect rectangular region of interest (ROI)
+/// Returns aligned ROI in pixels of current level of channel c
+/// @param c A channel index
+PGFRect CPGFImage::GetAlignedROI(int c /*= 0*/) const {
+	PGFRect roi(0, 0, m_width[c], m_height[c]);
+
+	if (ROIisSupported()) {
+		ASSERT(m_wtChannel[c]);
+
+		roi = m_wtChannel[c]->GetAlignedROI(m_currentLevel);
+	}
+	ASSERT(roi.Width() == m_width[c]);
+	ASSERT(roi.Height() == m_height[c]);
+	return roi;
+}
+
+//////////////////////////////////////////////////////////////////////
+/// Compute ROIs for each channel and each level <= current level
+/// Called inside of Read(rect, ...).
+/// @param rect rectangular region of interest (ROI) at level 0
 void CPGFImage::SetROI(PGFRect rect) {
 	ASSERT(m_decoder);
 	ASSERT(ROIisSupported());
+	ASSERT(m_wtChannel[0]);
 
 	// store ROI for a later call of GetBitmap
 	m_roi = rect;
@@ -574,28 +623,15 @@ void CPGFImage::SetROI(PGFRect rect) {
 	// enable ROI decoding
 	m_decoder->SetROI();
 
-	// enlarge ROI because of border artefacts
-	const UINT32 dx = FilterWidth/2*(1 << m_currentLevel);
-	const UINT32 dy = FilterHeight/2*(1 << m_currentLevel);
-
-	if (rect.left < dx) rect.left = 0;
-	else rect.left -= dx;
-	if (rect.top < dy) rect.top = 0;
-	else rect.top -= dy;
-	rect.right += dx;
-	if (rect.right > m_header.width) rect.right = m_header.width;
-	rect.bottom += dy;
-	if (rect.bottom > m_header.height) rect.bottom = m_header.height;
-
 	// prepare wavelet channels for using ROI
-	ASSERT(m_wtChannel[0]);
 	m_wtChannel[0]->SetROI(rect);
+
 	if (m_downsample && m_header.channels > 1) {
 		// all further channels are downsampled, therefore downsample ROI
 		rect.left >>= 1;
 		rect.top >>= 1;
-		rect.right >>= 1;
-		rect.bottom >>= 1;
+		rect.right = (rect.right + 1) >> 1;
+		rect.bottom = (rect.bottom + 1) >> 1;
 	}
 	for (int i=1; i < m_header.channels; i++) {
 		ASSERT(m_wtChannel[i]);
@@ -615,13 +651,13 @@ UINT32 CPGFImage::GetEncodedHeaderLength() const {
 }
 
 //////////////////////////////////////////////////////////////////////
-/// Reads the encoded PGF headers and copies it to a target buffer.
+/// Reads the encoded PGF header and copies it to a target buffer.
 /// Precondition: The PGF image has been opened with a call of Open(...).
 /// It might throw an IOException.
 /// @param target The target buffer
 /// @param targetLen The length of the target buffer in bytes
 /// @return The number of bytes copied to the target buffer
-UINT32 CPGFImage::ReadEncodedHeader(UINT8* target, UINT32 targetLen) const THROW_ {
+UINT32 CPGFImage::ReadEncodedHeader(UINT8* target, UINT32 targetLen) const {
 	ASSERT(target);
 	ASSERT(targetLen > 0);
 	ASSERT(m_decoder);
@@ -640,10 +676,22 @@ UINT32 CPGFImage::ReadEncodedHeader(UINT8* target, UINT32 targetLen) const THROW
 }
 
 ////////////////////////////////////////////////////////////////////
-/// Reset stream position to start of PGF pre-header
-void CPGFImage::ResetStreamPos() THROW_ {
-	ASSERT(m_decoder);
-	return m_decoder->SetStreamPosToStart(); 
+/// Reset stream position to start of PGF pre-header or start of data. Must not be called before Open() or before Write(). 
+/// Use this method after Read() if you want to read the same image several times, e.g. reading different ROIs.
+/// @param startOfData true: you want to read the same image several times. false: resets stream position to the initial position
+void CPGFImage::ResetStreamPos(bool startOfData) {
+	if (startOfData) {
+		ASSERT(m_decoder);
+		m_decoder->SetStreamPosToData();
+	} else {
+		if (m_decoder) {
+			m_decoder->SetStreamPosToStart();
+		} else if (m_encoder) {
+			m_encoder->SetStreamPosToStart();
+		} else {
+			ASSERT(false);
+		}
+	}
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -655,7 +703,7 @@ void CPGFImage::ResetStreamPos() THROW_ {
 /// @param target The target buffer
 /// @param targetLen The length of the target buffer in bytes
 /// @return The number of bytes copied to the target buffer
-UINT32 CPGFImage::ReadEncodedData(int level, UINT8* target, UINT32 targetLen) const THROW_ {
+UINT32 CPGFImage::ReadEncodedData(int level, UINT8* target, UINT32 targetLen) const {
 	ASSERT(level >= 0 && level < m_header.nLevels);
 	ASSERT(target);
 	ASSERT(targetLen > 0);
@@ -715,8 +763,9 @@ BYTE CPGFImage::UsedBitsPerChannel() const {
 }
 
 //////////////////////////////////////////////////////////////////////
-/// Return version
-BYTE CPGFImage::CurrentVersion(BYTE version) {
+/// Return major version
+BYTE CPGFImage::CodecMajorVersion(BYTE version) {
+	if (version & Version7) return 7;
 	if (version & Version6) return 6;
 	if (version & Version5) return 5;
 	if (version & Version2) return 2;
@@ -739,7 +788,7 @@ BYTE CPGFImage::CurrentVersion(BYTE version) {
 // @param channelMap A integer array containing the mapping of input channel ordering to expected channel ordering.
 // @param cb A pointer to a callback procedure. The procedure is called after each imported buffer row. If cb returns true, then it stops proceeding.
 // @param data Data Pointer to C++ class container to host callback procedure.
-void CPGFImage::ImportBitmap(int pitch, UINT8 *buff, BYTE bpp, int channelMap[] /*= NULL */, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) THROW_ {
+void CPGFImage::ImportBitmap(int pitch, UINT8 *buff, BYTE bpp, int channelMap[] /*= nullptr */, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) {
 	ASSERT(buff);
 	ASSERT(m_channel[0]);
 
@@ -756,6 +805,7 @@ void CPGFImage::ImportBitmap(int pitch, UINT8 *buff, BYTE bpp, int channelMap[]
 
 /////////////////////////////////////////////////////////////////
 // Bilinerar Subsampling of channel ch by a factor 2
+// Called before Write()
 void CPGFImage::Downsample(int ch) {
 	ASSERT(ch > 0);
 
@@ -801,7 +851,7 @@ void CPGFImage::Downsample(int ch) {
 
 //////////////////////////////////////////////////////////////////////
 void CPGFImage::ComputeLevels() {
-	const int maxThumbnailWidth = 20*FilterWidth;
+	const int maxThumbnailWidth = 20*FilterSize;
 	const int m = __min(m_header.width, m_header.height);
 	int s = m;
 
@@ -810,17 +860,17 @@ void CPGFImage::ComputeLevels() {
 		// compute a good value depending on the size of the image
 		while (s > maxThumbnailWidth) {
 			m_header.nLevels++;
-			s = s/2;
+			s >>= 1;
 		}
 	}
 
 	int levels = m_header.nLevels; // we need a signed value during level reduction
 
-	// reduce number of levels if the image size is smaller than FilterWidth*2^levels
-	s = FilterWidth*(1 << levels);	// must be at least the double filter size because of subsampling
+	// reduce number of levels if the image size is smaller than FilterSize*(2^levels)
+	s = FilterSize*(1 << levels);	// must be at least the double filter size because of subsampling
 	while (m < s) {
 		levels--;
-		s = s/2;
+		s >>= 1;
 	}
 	if (levels > MaxLevel) m_header.nLevels = MaxLevel;
 	else if (levels < 0) m_header.nLevels = 0;
@@ -834,16 +884,17 @@ void CPGFImage::ComputeLevels() {
 
 //////////////////////////////////////////////////////////////////////
 /// Set PGF header and user data.
-/// Precondition: The PGF image has been closed with Close(...) or never opened with Open(...).
+/// Precondition: The PGF image has been never opened with Open(...).
 /// It might throw an IOException.
 /// @param header A valid and already filled in PGF header structure
 /// @param flags A combination of additional version flags. In case you use level-wise encoding then set flag = PGFROI.
 /// @param userData A user-defined memory block containing any kind of cached metadata.
 /// @param userDataLength The size of user-defined memory block in bytes
-void CPGFImage::SetHeader(const PGFHeader& header, BYTE flags /*=0*/, UINT8* userData /*= 0*/, UINT32 userDataLength /*= 0*/) THROW_ {
+void CPGFImage::SetHeader(const PGFHeader& header, BYTE flags /*=0*/, const UINT8* userData /*= 0*/, UINT32 userDataLength /*= 0*/) {
 	ASSERT(!m_decoder);	// current image must be closed
 	ASSERT(header.quality <= MaxQuality);
-
+	ASSERT(userDataLength <= MaxUserDataSize);
+	
 	// init state
 #ifdef __PGFROISUPPORT__
 	m_streamReinitialized = false;
@@ -857,6 +908,9 @@ void CPGFImage::SetHeader(const PGFHeader& header, BYTE flags /*=0*/, UINT8* use
 	// copy header
 	memcpy(&m_header, &header, HeaderSize);
 
+	// check quality
+	if (m_header.quality > MaxQuality) m_header.quality = MaxQuality;
+
 	// complete header
 	CompleteHeader();
 
@@ -884,9 +938,10 @@ void CPGFImage::SetHeader(const PGFHeader& header, BYTE flags /*=0*/, UINT8* use
 		m_preHeader.hSize += ColorTableSize;
 	}
 	if (userDataLength && userData) {
+		if (userDataLength > MaxUserDataSize) userDataLength = MaxUserDataSize;
 		m_postHeader.userData = new(std::nothrow) UINT8[userDataLength];
 		if (!m_postHeader.userData) ReturnWithError(InsufficientMemory);
-		m_postHeader.userDataLen = userDataLength;
+		m_postHeader.userDataLen = m_postHeader.cachedUserDataLen = userDataLength;
 		memcpy(m_postHeader.userData, userData, userDataLength);
 		// update header size
 		m_preHeader.hSize += userDataLength;
@@ -914,12 +969,13 @@ void CPGFImage::SetHeader(const PGFHeader& header, BYTE flags /*=0*/, UINT8* use
 
 //////////////////////////////////////////////////////////////////
 /// Create wavelet transform channels and encoder. Write header at current stream position.
+/// Performs forward FWT.
 /// Call this method before your first call of Write(int level) or WriteImage(), but after SetHeader().
 /// This method is called inside of Write(stream, ...).
 /// It might throw an IOException.
 /// @param stream A PGF stream
 /// @return The number of bytes written into stream.
-UINT32 CPGFImage::WriteHeader(CPGFStream* stream) THROW_ {
+UINT32 CPGFImage::WriteHeader(CPGFStream* stream) {
 	ASSERT(m_header.nLevels <= MaxLevel);
 	ASSERT(m_header.quality <= MaxQuality); // quality is already initialized
 
@@ -978,7 +1034,7 @@ UINT32 CPGFImage::WriteHeader(CPGFStream* stream) THROW_ {
 
 		m_currentLevel = m_header.nLevels;
 
-		// create encoder and eventually write headers and levelLength
+		// create encoder, write headers and user data, but not level-length area
 		m_encoder = new CEncoder(stream, m_preHeader, m_header, m_postHeader, m_userDataPos, m_useOMPinEncoder);
 		if (m_favorSpeedOverSize) m_encoder->FavorSpeedOverSize();
 
@@ -992,7 +1048,7 @@ UINT32 CPGFImage::WriteHeader(CPGFStream* stream) THROW_ {
 	} else {
 		// very small image: we don't use DWT and encoding
 
-		// create encoder and eventually write headers and levelLength
+		// create encoder, write headers and user data, but not level-length area
 		m_encoder = new CEncoder(stream, m_preHeader, m_header, m_postHeader, m_userDataPos, m_useOMPinEncoder);
 	}
 
@@ -1008,7 +1064,7 @@ UINT32 CPGFImage::WriteHeader(CPGFStream* stream) THROW_ {
 // The image size at level i is double the size (width, height) of the image at level i+1.
 // The image at level 0 contains the original size.
 // It might throw an IOException.
-void CPGFImage::WriteLevel() THROW_ {
+void CPGFImage::WriteLevel() {
 	ASSERT(m_encoder);
 	ASSERT(m_currentLevel > 0);
 	ASSERT(m_header.nLevels > 0);
@@ -1026,18 +1082,19 @@ void CPGFImage::WriteLevel() THROW_ {
 				// last level also has LL band
 				ASSERT(nTiles == 1);
 				m_wtChannel[i]->GetSubband(m_currentLevel, LL)->ExtractTile(*m_encoder);
-				m_encoder->EncodeTileBuffer();
+				m_encoder->EncodeTileBuffer(); // encode macro block with tile-end = true
 			}
 			for (UINT32 tileY=0; tileY < nTiles; tileY++) {
 				for (UINT32 tileX=0; tileX < nTiles; tileX++) {
+					// extract tile to macro block and encode already filled macro blocks with tile-end = false
 					m_wtChannel[i]->GetSubband(m_currentLevel, HL)->ExtractTile(*m_encoder, true, tileX, tileY);
 					m_wtChannel[i]->GetSubband(m_currentLevel, LH)->ExtractTile(*m_encoder, true, tileX, tileY);
 					m_wtChannel[i]->GetSubband(m_currentLevel, HH)->ExtractTile(*m_encoder, true, tileX, tileY);
 					if (i == lastChannel && tileY == lastTile && tileX == lastTile) {
-						// all necessary data are buffered. next call of EncodeBuffer will write the last piece of data of the current level.
+						// all necessary data are buffered. next call of EncodeTileBuffer will write the last piece of data of the current level.
 						m_encoder->SetEncodedLevel(--m_currentLevel);
 					}
-					m_encoder->EncodeTileBuffer();
+					m_encoder->EncodeTileBuffer(); // encode last macro block with tile-end = true
 				}
 			}
 		}
@@ -1063,7 +1120,7 @@ void CPGFImage::WriteLevel() THROW_ {
 
 //////////////////////////////////////////////////////////////////////
 // Return written levelLength bytes
-UINT32 CPGFImage::UpdatePostHeaderSize() THROW_ {
+UINT32 CPGFImage::UpdatePostHeaderSize() {
 	ASSERT(m_encoder);
 
 	INT64 offset = m_encoder->ComputeOffset(); ASSERT(offset >= 0);
@@ -1079,8 +1136,9 @@ UINT32 CPGFImage::UpdatePostHeaderSize() THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-/// Encode and write the one and only image at current stream position.
-/// Call this method after WriteHeader(). In case you want to write uncached metadata, 
+/// Encode and write an image at current stream position.
+/// Call this method after WriteHeader(). 
+/// In case you want to write uncached metadata, 
 /// then do that after WriteHeader() and before WriteImage(). 
 /// This method is called inside of Write(stream, ...).
 /// It might throw an IOException.
@@ -1088,7 +1146,7 @@ UINT32 CPGFImage::UpdatePostHeaderSize() THROW_ {
 /// @param cb A pointer to a callback procedure. The procedure is called after writing a single level. If cb returns true, then it stops proceeding.
 /// @param data Data Pointer to C++ class container to host callback procedure.
 /// @return The number of bytes written into stream.
-UINT32 CPGFImage::WriteImage(CPGFStream* stream, CallbackPtr cb /*= NULL*/, void *data /*= NULL*/) THROW_ {
+UINT32 CPGFImage::WriteImage(CPGFStream* stream, CallbackPtr cb /*= nullptr*/, void *data /*= nullptr*/) {
 	ASSERT(stream);
 	ASSERT(m_preHeader.hSize);
 
@@ -1099,7 +1157,7 @@ UINT32 CPGFImage::WriteImage(CPGFStream* stream, CallbackPtr cb /*= NULL*/, void
 	UINT32 nWrittenBytes = UpdatePostHeaderSize();
 
 	if (levels == 0) {
-		// write channels
+		// for very small images: write channels uncoded
 		for (int c=0; c < m_header.channels; c++) {
 			const UINT32 size = m_width[c]*m_height[c];
 
@@ -1139,7 +1197,7 @@ UINT32 CPGFImage::WriteImage(CPGFStream* stream, CallbackPtr cb /*= NULL*/, void
 	nWrittenBytes += m_encoder->UpdateLevelLength(); // return written image bytes 
 
 	// delete encoder
-	delete m_encoder; m_encoder = NULL;
+	delete m_encoder; m_encoder = nullptr;
 
 	ASSERT(!m_encoder);
 
@@ -1147,7 +1205,7 @@ UINT32 CPGFImage::WriteImage(CPGFStream* stream, CallbackPtr cb /*= NULL*/, void
 }
 
 //////////////////////////////////////////////////////////////////
-/// Encode and write a entire PGF image (header and image) at current stream position.
+/// Encode and write an entire PGF image (header and image) at current stream position.
 /// A PGF image is structered in levels, numbered between 0 and Levels() - 1.
 /// Each level can be seen as a single image, containing the same content
 /// as all other levels, but in a different size (width, height).
@@ -1159,7 +1217,7 @@ UINT32 CPGFImage::WriteImage(CPGFStream* stream, CallbackPtr cb /*= NULL*/, void
 /// @param nWrittenBytes [in-out] The number of bytes written into stream are added to the input value.
 /// @param cb A pointer to a callback procedure. The procedure is called after writing a single level. If cb returns true, then it stops proceeding.
 /// @param data Data Pointer to C++ class container to host callback procedure.
-void CPGFImage::Write(CPGFStream* stream, UINT32* nWrittenBytes /*= NULL*/, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) THROW_ {
+void CPGFImage::Write(CPGFStream* stream, UINT32* nWrittenBytes /*= nullptr*/, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) {
 	ASSERT(stream);
 	ASSERT(m_preHeader.hSize);
 
@@ -1181,14 +1239,14 @@ void CPGFImage::Write(CPGFStream* stream, UINT32* nWrittenBytes /*= NULL*/, Call
 // as all other levels, but in a different size (width, height).
 // The image size at level i is double the size (width, height) of the image at level i+1.
 // The image at level 0 contains the original size.
-// Precondition: the PGF image contains a valid header (see also SetHeader(...)) and WriteHeader() has been called before Write().
+// Precondition: the PGF image contains a valid header (see also SetHeader(...)) and WriteHeader() has been called before.
 // The ROI encoding scheme is used.
 // It might throw an IOException.
 // @param level The image level of the resulting image in the internal image buffer.
 // @param cb A pointer to a callback procedure. The procedure is called after writing a single level. If cb returns true, then it stops proceeding.
 // @param data Data Pointer to C++ class container to host callback procedure.
 // @return The number of bytes written into stream.
-UINT32 CPGFImage::Write(int level, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) THROW_ {
+UINT32 CPGFImage::Write(int level, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) {
 	ASSERT(m_header.nLevels > 0);
 	ASSERT(0 <= level && level < m_header.nLevels);
 	ASSERT(m_encoder);
@@ -1288,7 +1346,7 @@ bool CPGFImage::ImportIsSupported(BYTE mode) {
 /// @param iFirstColor The color table index of the first entry to retrieve.
 /// @param nColors The number of color table entries to retrieve.
 /// @param prgbColors A pointer to the array of RGBQUAD structures to retrieve the color table entries.
-void CPGFImage::GetColorTable(UINT32 iFirstColor, UINT32 nColors, RGBQUAD* prgbColors) const THROW_ {
+void CPGFImage::GetColorTable(UINT32 iFirstColor, UINT32 nColors, RGBQUAD* prgbColors) const {
 	if (iFirstColor + nColors > ColorTableLen)	ReturnWithError(ColorTableError);
 
 	for (UINT32 i=iFirstColor, j=0; j < nColors; i++, j++) {
@@ -1302,7 +1360,7 @@ void CPGFImage::GetColorTable(UINT32 iFirstColor, UINT32 nColors, RGBQUAD* prgbC
 /// @param iFirstColor The color table index of the first entry to set.
 /// @param nColors The number of color table entries to set.
 /// @param prgbColors A pointer to the array of RGBQUAD structures to set the color table entries.
-void CPGFImage::SetColorTable(UINT32 iFirstColor, UINT32 nColors, const RGBQUAD* prgbColors) THROW_ {
+void CPGFImage::SetColorTable(UINT32 iFirstColor, UINT32 nColors, const RGBQUAD* prgbColors) {
 	if (iFirstColor + nColors > ColorTableLen)	ReturnWithError(ColorTableError);
 
 	for (UINT32 i=iFirstColor, j=0; j < nColors; i++, j++) {
@@ -1327,9 +1385,9 @@ void CPGFImage::SetColorTable(UINT32 iFirstColor, UINT32 nColors, const RGBQUAD*
 // The sequence of input channels in the input image buffer does not need to be the same as expected from PGF. In case of different sequences you have to
 // provide a channelMap of size of expected channels (depending on image mode). For example, PGF expects in RGB color mode a channel sequence BGR.
 // If your provided image buffer contains a channel sequence ARGB, then the channelMap looks like { 3, 2, 1 }.
-void CPGFImage::RgbToYuv(int pitch, UINT8* buff, BYTE bpp, int channelMap[], CallbackPtr cb, void *data /*=NULL*/) THROW_ {
+void CPGFImage::RgbToYuv(int pitch, UINT8* buff, BYTE bpp, int channelMap[], CallbackPtr cb, void *data /*=nullptr*/) {
 	ASSERT(buff);
-	int yPos = 0, cnt = 0;
+	UINT32 yPos = 0, cnt = 0;
 	double percent = 0;
 	const double dP = 1.0/m_header.height;
 	int defMap[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; ASSERT(sizeof(defMap)/sizeof(defMap[0]) == MaxChannels);
@@ -1347,30 +1405,41 @@ void CPGFImage::RgbToYuv(int pitch, UINT8* buff, BYTE bpp, int channelMap[], Cal
 			const UINT32 w2 = (m_header.width + 7)/8;
 			DataT* y = m_channel[0]; ASSERT(y);
 
-			for (UINT32 h=0; h < m_header.height; h++) {
+			// new unpacked version since version 7
+			for (UINT32 h = 0; h < m_header.height; h++) {
 				if (cb) {
 					if ((*cb)(percent, true, data)) ReturnWithError(EscapePressed);
 					percent += dP;
 				}
-				
-				for (UINT32 j=0; j < w2; j++) {
-					y[yPos++] = buff[j] - YUVoffset8;
+				cnt = 0;
+				for (UINT32 j = 0; j < w2; j++) {
+					UINT8 byte = buff[j];
+					for (int k = 0; k < 8; k++) {
+						UINT8 bit = (byte & 0x80) >> 7;
+						if (cnt < w) y[yPos++] = bit;
+						byte <<= 1;
+						cnt++;
+					}
+				}
+				buff += pitch;
+			}
+			/* old version: packed values: 8 pixels in 1 byte
+			for (UINT32 h = 0; h < m_header.height; h++) {
+				if (cb) {
+					if ((*cb)(percent, true, data)) ReturnWithError(EscapePressed);
+					percent += dP;
 				}
-				for (UINT32 j=w2; j < w; j++) {
-					y[yPos++] = YUVoffset8;
+
+				for (UINT32 j = 0; j < w2; j++) {
+					y[yPos++] = buff[j] - YUVoffset8;
 				}
-				
-				//UINT cnt = w;
-				//for (UINT32 j=0; j < w2; j++) {
-				//	for (int k=7; k >= 0; k--) {
-				//		if (cnt) { 
-				//			y[yPos++] = YUVoffset8 + (1 & (buff[j] >> k));
-				//			cnt--;
-				//		}
-				//	}
+				// version 5 and 6
+				// for (UINT32 j = w2; j < w; j++) {
+				//	y[yPos++] = YUVoffset8;
 				//}
-				buff += pitch;	
+				buff += pitch;
 			}
+			*/
 		}
 		break;
 	case ImageModeIndexedColor:
@@ -1716,40 +1785,44 @@ void CPGFImage::RgbToYuv(int pitch, UINT8* buff, BYTE bpp, int channelMap[], Cal
 // @param channelMap A integer array containing the mapping of PGF channel ordering to expected channel ordering.
 // @param cb A pointer to a callback procedure. The procedure is called after each copied buffer row. If cb returns true, then it stops proceeding.
 // @param data Data Pointer to C++ class container to host callback procedure.
-void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*= NULL */, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) const THROW_ {
+void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*= nullptr */, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) const {
 	ASSERT(buff);
-	UINT32 w = m_width[0];
-	UINT32 h = m_height[0];
-	UINT8* targetBuff = 0;	// used if ROI is used
-	UINT8* buffStart = 0;	// used if ROI is used
-	int targetPitch = 0;	// used if ROI is used
+	UINT32 w = m_width[0];  // width of decoded image
+	UINT32 h = m_height[0]; // height of decoded image
+	UINT32 yw = w;			// y-channel width
+	UINT32 uw = m_width[1];	// u-channel width
+	UINT32 roiOffsetX = 0;
+	UINT32 roiOffsetY = 0;
+	UINT32 yOffset = 0;
+	UINT32 uOffset = 0;
 
 #ifdef __PGFROISUPPORT__
-	const PGFRect& roi = (ROIisSupported()) ? m_wtChannel[0]->GetROI(m_currentLevel) : PGFRect(0, 0, w, h); // roi is usually larger than m_roi
-	const PGFRect levelRoi(LevelWidth(m_roi.left, m_currentLevel), LevelHeight(m_roi.top, m_currentLevel), LevelWidth(m_roi.Width(), m_currentLevel), LevelHeight(m_roi.Height(), m_currentLevel));
-	ASSERT(w <= roi.Width() && h <= roi.Height()); 
+	const PGFRect& roi = GetAlignedROI(); // in pixels, roi is usually larger than levelRoi
+	ASSERT(w == roi.Width() && h == roi.Height());
+	const PGFRect levelRoi = ComputeLevelROI();
 	ASSERT(roi.left <= levelRoi.left && levelRoi.right <= roi.right); 
 	ASSERT(roi.top <= levelRoi.top && levelRoi.bottom <= roi.bottom); 
 
 	if (ROIisSupported() && (levelRoi.Width() < w || levelRoi.Height() < h)) {
-		// ROI is used -> create a temporary image buffer for roi
-		// compute pitch
-		targetPitch = pitch;
-		pitch = AlignWordPos(w*bpp)/8;
-
-		// create temporary output buffer
-		targetBuff = buff;
-		buff = buffStart = new(std::nothrow) UINT8[pitch*h];
-		if (!buff) ReturnWithError(InsufficientMemory);
+		// ROI is used 
+		w = levelRoi.Width();
+		h = levelRoi.Height();
+		roiOffsetX = levelRoi.left - roi.left;
+		roiOffsetY = levelRoi.top - roi.top;
+		yOffset = roiOffsetX + roiOffsetY*yw;
+
+		if (m_downsample) {
+			const PGFRect& downsampledRoi = GetAlignedROI(1);
+			uOffset = levelRoi.left/2 - downsampledRoi.left + (levelRoi.top/2 - downsampledRoi.top)*m_width[1];
+		} else {
+			uOffset = yOffset;
+		}
 	}
 #endif
 
-	const bool wOdd = (1 == w%2);
-
 	const double dP = 1.0/h;
 	int defMap[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; ASSERT(sizeof(defMap)/sizeof(defMap[0]) == MaxChannels);
-	if (channelMap == NULL) channelMap = defMap;
-	int sampledPos = 0, yPos = 0;
+	if (channelMap == nullptr) channelMap = defMap;
 	DataT uAvg, vAvg;
 	double percent = 0;
 	UINT32 i, j;
@@ -1764,29 +1837,48 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			const UINT32 w2 = (w + 7)/8;
 			DataT* y = m_channel[0]; ASSERT(y);
 
-			for (i=0; i < h; i++) {
-				
-				for (j=0; j < w2; j++) {
-					buff[j] = Clamp8(y[yPos++] + YUVoffset8);
+			if (m_preHeader.version & Version7) {
+				// new unpacked version has a little better compression ratio
+				// since version 7
+				for (i = 0; i < h; i++) {
+					UINT32 cnt = 0;
+					for (j = 0; j < w2; j++) {
+						UINT8 byte = 0;
+						for (int k = 0; k < 8; k++) {
+							byte <<= 1;
+							UINT8 bit = 0;
+							if (cnt < w) {
+								bit = y[yOffset + cnt] & 1;
+							}
+							byte |= bit;
+							cnt++;
+						}
+						buff[j] = byte;
+					}
+					yOffset += yw;
+					buff += pitch;
+
+					if (cb) {
+						percent += dP;
+						if ((*cb)(percent, true, data)) ReturnWithError(EscapePressed);
+					}
 				}
-				yPos += w - w2;
-				
-				//UINT32 cnt = w;
-				//for (j=0; j < w2; j++) {
-				//	buff[j] = 0;
-				//	for (int k=0; k < 8; k++) {
-				//		if (cnt) {
-				//			buff[j] <<= 1;
-				//			buff[j] |= (1 & (y[yPos++] - YUVoffset8)); 
-				//			cnt--;
-				//		}
-				//	}
-				//}
-				buff += pitch;
+			} else {
+				// old versions
+				// packed pixels: 8 pixel in 1 byte of channel[0]
+				if (!(m_preHeader.version & Version5)) yw = w2; // not version 5 or 6
+				yOffset = roiOffsetX/8 + roiOffsetY*yw; // 1 byte in y contains 8 pixel values
+				for (i = 0; i < h; i++) {
+					for (j = 0; j < w2; j++) {
+						buff[j] = Clamp8(y[yOffset + j] + YUVoffset8);
+					}
+					yOffset += yw;
+					buff += pitch;
 
-				if (cb) {
-					percent += dP;
-					if ((*cb)(percent, true, data)) ReturnWithError(EscapePressed);
+					if (cb) {
+						percent += dP;
+						if ((*cb)(percent, true, data)) ReturnWithError(EscapePressed);
+					}
 				}
 			}
 			break;
@@ -1800,17 +1892,19 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			ASSERT(m_header.bpp == m_header.channels*8);
 			ASSERT(bpp%8 == 0);
 
-			int cnt, channels = bpp/8; ASSERT(channels >= m_header.channels);
+			UINT32 cnt, channels = bpp/8; ASSERT(channels >= m_header.channels);
 
 			for (i=0; i < h; i++) {
+				UINT32 yPos = yOffset;
 				cnt = 0;
 				for (j=0; j < w; j++) {
-					for (int c=0; c < m_header.channels; c++) {
+					for (UINT32 c=0; c < m_header.channels; c++) {
 						buff[cnt + channelMap[c]] = Clamp8(m_channel[c][yPos] + YUVoffset8);
 					}
 					cnt += channels;
 					yPos++;
 				}
+				yOffset += yw;
 				buff += pitch;
 
 				if (cb) {
@@ -1826,7 +1920,7 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			ASSERT(m_header.bpp == m_header.channels*16);
 
 			const DataT yuvOffset16 = 1 << (UsedBitsPerChannel() - 1);
-			int cnt, channels;
+			UINT32 cnt, channels;
 
 			if (bpp%16 == 0) {
 				const int shift = 16 - UsedBitsPerChannel(); ASSERT(shift >= 0);
@@ -1835,14 +1929,16 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/16; ASSERT(channels >= m_header.channels);
 
 				for (i=0; i < h; i++) {
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						for (int c=0; c < m_header.channels; c++) {
+						for (UINT32 c=0; c < m_header.channels; c++) {
 							buff16[cnt + channelMap[c]] = Clamp16((m_channel[c][yPos] + yuvOffset16) << shift);
 						}
 						cnt += channels;
 						yPos++;
 					}
+					yOffset += yw;
 					buff16 += pitch16;
 
 					if (cb) {
@@ -1856,14 +1952,16 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/8; ASSERT(channels >= m_header.channels);
 				
 				for (i=0; i < h; i++) {
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						for (int c=0; c < m_header.channels; c++) {
+						for (UINT32 c=0; c < m_header.channels; c++) {
 							buff[cnt + channelMap[c]] = Clamp8((m_channel[c][yPos] + yuvOffset16) >> shift);
 						}
 						cnt += channels;
 						yPos++;
 					}
+					yOffset += yw;
 					buff += pitch;
 
 					if (cb) {
@@ -1888,35 +1986,41 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				  *buffr = &buff[channelMap[2]],
 				  *buffb = &buff[channelMap[0]];
 			UINT8 g;
-			int cnt, channels = bpp/8;
-			if(m_downsample){
+			UINT32 cnt, channels = bpp/8;
+
+			if (m_downsample) {
 				for (i=0; i < h; i++) {
-					if (i%2) sampledPos -= (w + 1)/2;
+					UINT32 uPos = uOffset;
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						// image was downsampled
-						uAvg = u[sampledPos];
-						vAvg = v[sampledPos];
+						// u and v are downsampled
+						uAvg = u[uPos];
+						vAvg = v[uPos];
 						// Yuv
 						buffg[cnt] = g = Clamp8(y[yPos] + YUVoffset8 - ((uAvg + vAvg ) >> 2)); // must be logical shift operator
 						buffr[cnt] = Clamp8(uAvg + g);
 						buffb[cnt] = Clamp8(vAvg + g);
-						yPos++;
 						cnt += channels;
-						if (j%2) sampledPos++;
+						if (j & 1) uPos++;
+						yPos++;
 					}
+					if (i & 1) uOffset += uw;
+					yOffset += yw;
 					buffb += pitch;
 					buffg += pitch;
 					buffr += pitch;
-					if (wOdd) sampledPos++;
+
 					if (cb) {
 						percent += dP;
 						if ((*cb)(percent, true, data)) ReturnWithError(EscapePressed);
 					}
 				}
-			}else{
+
+			} else {
 				for (i=0; i < h; i++) {
 					cnt = 0;
+					UINT32 yPos = yOffset;
 					for (j = 0; j < w; j++) {
 						uAvg = u[yPos];
 						vAvg = v[yPos];
@@ -1924,9 +2028,10 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 						buffg[cnt] = g = Clamp8(y[yPos] + YUVoffset8 - ((uAvg + vAvg ) >> 2)); // must be logical shift operator
 						buffr[cnt] = Clamp8(uAvg + g);
 						buffb[cnt] = Clamp8(vAvg + g);
-						yPos++;
 						cnt += channels;
+						yPos++;
 					}
+					yOffset += yw;
 					buffb += pitch;
 					buffg += pitch;
 					buffr += pitch;
@@ -1949,7 +2054,7 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			DataT* y = m_channel[0]; ASSERT(y);
 			DataT* u = m_channel[1]; ASSERT(u);
 			DataT* v = m_channel[2]; ASSERT(v);
-			int cnt, channels;
+			UINT32 cnt, channels;
 			DataT g;
 
 			if (bpp >= 48 && bpp%16 == 0) {
@@ -1959,28 +2064,24 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/16; ASSERT(channels >= m_header.channels);
 
 				for (i=0; i < h; i++) {
-					if (i%2) sampledPos -= (w + 1)/2;
+					UINT32 uPos = uOffset;
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						if (m_downsample) {
-							// image was downsampled
-							uAvg = u[sampledPos];
-							vAvg = v[sampledPos];
-						} else {
-							uAvg = u[yPos];
-							vAvg = v[yPos];
-						}
+						uAvg = u[uPos];
+						vAvg = v[uPos];
 						// Yuv
 						g = y[yPos] + yuvOffset16 - ((uAvg + vAvg ) >> 2); // must be logical shift operator
 						buff16[cnt + channelMap[1]] = Clamp16(g << shift);
 						buff16[cnt + channelMap[2]] = Clamp16((uAvg + g) << shift);
 						buff16[cnt + channelMap[0]] = Clamp16((vAvg + g) << shift);
-						yPos++; 
 						cnt += channels;
-						if (j%2) sampledPos++;
+						if (!m_downsample || (j & 1)) uPos++;
+						yPos++;
 					}
+					if (!m_downsample || (i & 1)) uOffset += uw;
+					yOffset += yw;
 					buff16 += pitch16;
-					if (wOdd) sampledPos++;
 
 					if (cb) {
 						percent += dP;
@@ -1993,28 +2094,24 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/8; ASSERT(channels >= m_header.channels);
 
 				for (i=0; i < h; i++) {
-					if (i%2) sampledPos -= (w + 1)/2;
+					UINT32 uPos = uOffset;
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						if (m_downsample) {
-							// image was downsampled
-							uAvg = u[sampledPos];
-							vAvg = v[sampledPos];
-						} else {
-							uAvg = u[yPos];
-							vAvg = v[yPos];
-						}
+						uAvg = u[uPos];
+						vAvg = v[uPos];
 						// Yuv
 						g = y[yPos] + yuvOffset16 - ((uAvg + vAvg ) >> 2); // must be logical shift operator
 						buff[cnt + channelMap[1]] = Clamp8(g >> shift); 
 						buff[cnt + channelMap[2]] = Clamp8((uAvg + g) >> shift);
 						buff[cnt + channelMap[0]] = Clamp8((vAvg + g) >> shift);
-						yPos++; 
 						cnt += channels;
-						if (j%2) sampledPos++;
+						if (!m_downsample || (j & 1)) uPos++;
+						yPos++;
 					}
+					if (!m_downsample || (i & 1)) uOffset += uw;
+					yOffset += yw;
 					buff += pitch;
-					if (wOdd) sampledPos++;
 
 					if (cb) {
 						percent += dP;
@@ -2033,29 +2130,25 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			DataT* l = m_channel[0]; ASSERT(l);
 			DataT* a = m_channel[1]; ASSERT(a);
 			DataT* b = m_channel[2]; ASSERT(b);
-			int cnt, channels = bpp/8; ASSERT(channels >= m_header.channels);
+			UINT32 cnt, channels = bpp/8; ASSERT(channels >= m_header.channels);
 
 			for (i=0; i < h; i++) {
-				if (i%2) sampledPos -= (w + 1)/2;
+				UINT32 uPos = uOffset;
+				UINT32 yPos = yOffset;
 				cnt = 0;
 				for (j=0; j < w; j++) {
-					if (m_downsample) {
-						// image was downsampled
-						uAvg = a[sampledPos];
-						vAvg = b[sampledPos];
-					} else {
-						uAvg = a[yPos];
-						vAvg = b[yPos];
-					}
+					uAvg = a[uPos];
+					vAvg = b[uPos];
 					buff[cnt + channelMap[0]] = Clamp8(l[yPos] + YUVoffset8);
 					buff[cnt + channelMap[1]] = Clamp8(uAvg + YUVoffset8); 
 					buff[cnt + channelMap[2]] = Clamp8(vAvg + YUVoffset8);
 					cnt += channels;
+					if (!m_downsample || (j & 1)) uPos++;
 					yPos++;
-					if (j%2) sampledPos++;
 				}
+				if (!m_downsample || (i & 1)) uOffset += uw;
+				yOffset += yw;
 				buff += pitch;
-				if (wOdd) sampledPos++;
 
 				if (cb) {
 					percent += dP;
@@ -2074,7 +2167,7 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			DataT* l = m_channel[0]; ASSERT(l);
 			DataT* a = m_channel[1]; ASSERT(a);
 			DataT* b = m_channel[2]; ASSERT(b);
-			int cnt, channels;
+			UINT32 cnt, channels;
 
 			if (bpp%16 == 0) {
 				const int shift = 16 - UsedBitsPerChannel(); ASSERT(shift >= 0);
@@ -2083,26 +2176,22 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/16; ASSERT(channels >= m_header.channels);
 
 				for (i=0; i < h; i++) {
-					if (i%2) sampledPos -= (w + 1)/2;
+					UINT32 uPos = uOffset;
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						if (m_downsample) {
-							// image was downsampled
-							uAvg = a[sampledPos];
-							vAvg = b[sampledPos];
-						} else {
-							uAvg = a[yPos];
-							vAvg = b[yPos];
-						}
+						uAvg = a[uPos];
+						vAvg = b[uPos];
 						buff16[cnt + channelMap[0]] = Clamp16((l[yPos] + yuvOffset16) << shift);
 						buff16[cnt + channelMap[1]] = Clamp16((uAvg + yuvOffset16) << shift);
 						buff16[cnt + channelMap[2]] = Clamp16((vAvg + yuvOffset16) << shift);
 						cnt += channels;
+						if (!m_downsample || (j & 1)) uPos++;
 						yPos++;
-						if (j%2) sampledPos++;
 					}
+					if (!m_downsample || (i & 1)) uOffset += uw;
+					yOffset += yw;
 					buff16 += pitch16;
-					if (wOdd) sampledPos++;
 
 					if (cb) {
 						percent += dP;
@@ -2115,26 +2204,22 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/8; ASSERT(channels >= m_header.channels);
 
 				for (i=0; i < h; i++) {
-					if (i%2) sampledPos -= (w + 1)/2;
+					UINT32 uPos = uOffset;
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						if (m_downsample) {
-							// image was downsampled
-							uAvg = a[sampledPos];
-							vAvg = b[sampledPos];
-						} else {
-							uAvg = a[yPos];
-							vAvg = b[yPos];
-						}
+						uAvg = a[uPos];
+						vAvg = b[uPos];
 						buff[cnt + channelMap[0]] = Clamp8((l[yPos] + yuvOffset16) >> shift);
 						buff[cnt + channelMap[1]] = Clamp8((uAvg + yuvOffset16) >> shift);
 						buff[cnt + channelMap[2]] = Clamp8((vAvg + yuvOffset16) >> shift);
 						cnt += channels;
+						if (!m_downsample || (j & 1)) uPos++;
 						yPos++;
-						if (j%2) sampledPos++;
 					}
+					if (!m_downsample || (i & 1)) uOffset += uw;
+					yOffset += yw;
 					buff += pitch;
-					if (wOdd) sampledPos++;
 
 					if (cb) {
 						percent += dP;
@@ -2156,33 +2241,28 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			DataT* v = m_channel[2]; ASSERT(v);
 			DataT* a = m_channel[3]; ASSERT(a);
 			UINT8 g, aAvg;
-			int cnt, channels = bpp/8; ASSERT(channels >= m_header.channels);
+			UINT32 cnt, channels = bpp/8; ASSERT(channels >= m_header.channels);
 
 			for (i=0; i < h; i++) {
-				if (i%2) sampledPos -= (w + 1)/2;
+				UINT32 uPos = uOffset;
+				UINT32 yPos = yOffset;
 				cnt = 0;
 				for (j=0; j < w; j++) {
-					if (m_downsample) {
-						// image was downsampled
-						uAvg = u[sampledPos];
-						vAvg = v[sampledPos];
-						aAvg = Clamp8(a[sampledPos] + YUVoffset8);
-					} else {
-						uAvg = u[yPos];
-						vAvg = v[yPos];
-						aAvg = Clamp8(a[yPos] + YUVoffset8);
-					}
+					uAvg = u[uPos];
+					vAvg = v[uPos];
+					aAvg = Clamp8(a[uPos] + YUVoffset8);
 					// Yuv
 					buff[cnt + channelMap[1]] = g = Clamp8(y[yPos] + YUVoffset8 - ((uAvg + vAvg ) >> 2)); // must be logical shift operator
 					buff[cnt + channelMap[2]] = Clamp8(uAvg + g);
 					buff[cnt + channelMap[0]] = Clamp8(vAvg + g);
 					buff[cnt + channelMap[3]] = aAvg;
-					yPos++; 
 					cnt += channels;
-					if (j%2) sampledPos++;
+					if (!m_downsample || (j & 1)) uPos++;
+					yPos++;
 				}
+				if (!m_downsample || (i & 1)) uOffset += uw;
+				yOffset += yw;
 				buff += pitch;
-				if (wOdd) sampledPos++;
 
 				if (cb) {
 					percent += dP;
@@ -2203,7 +2283,7 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			DataT* v = m_channel[2]; ASSERT(v);
 			DataT* a = m_channel[3]; ASSERT(a);
 			DataT g, aAvg;
-			int cnt, channels;
+			UINT32 cnt, channels;
 
 			if (bpp%16 == 0) {
 				const int shift = 16 - UsedBitsPerChannel(); ASSERT(shift >= 0);
@@ -2212,31 +2292,26 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/16; ASSERT(channels >= m_header.channels);
 
 				for (i=0; i < h; i++) {
-					if (i%2) sampledPos -= (w + 1)/2;
+					UINT32 uPos = uOffset;
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						if (m_downsample) {
-							// image was downsampled
-							uAvg = u[sampledPos];
-							vAvg = v[sampledPos];
-							aAvg = a[sampledPos] + yuvOffset16;
-						} else {
-							uAvg = u[yPos];
-							vAvg = v[yPos];
-							aAvg = a[yPos] + yuvOffset16;
-						}
+						uAvg = u[uPos];
+						vAvg = v[uPos];
+						aAvg = a[uPos] + yuvOffset16;
 						// Yuv
 						g = y[yPos] + yuvOffset16 - ((uAvg + vAvg ) >> 2); // must be logical shift operator
 						buff16[cnt + channelMap[1]] = Clamp16(g << shift);
 						buff16[cnt + channelMap[2]] = Clamp16((uAvg + g) << shift);
 						buff16[cnt + channelMap[0]] = Clamp16((vAvg + g) << shift);
 						buff16[cnt + channelMap[3]] = Clamp16(aAvg << shift);
-						yPos++; 
 						cnt += channels;
-						if (j%2) sampledPos++;
+						if (!m_downsample || (j & 1)) uPos++;
+						yPos++;
 					}
+					if (!m_downsample || (i & 1)) uOffset += uw;
+					yOffset += yw;
 					buff16 += pitch16;
-					if (wOdd) sampledPos++;
 
 					if (cb) {
 						percent += dP;
@@ -2249,31 +2324,26 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				channels = bpp/8; ASSERT(channels >= m_header.channels);
 
 				for (i=0; i < h; i++) {
-					if (i%2) sampledPos -= (w + 1)/2;
+					UINT32 uPos = uOffset;
+					UINT32 yPos = yOffset;
 					cnt = 0;
 					for (j=0; j < w; j++) {
-						if (m_downsample) {
-							// image was downsampled
-							uAvg = u[sampledPos];
-							vAvg = v[sampledPos];
-							aAvg = a[sampledPos] + yuvOffset16;
-						} else {
-							uAvg = u[yPos];
-							vAvg = v[yPos];
-							aAvg = a[yPos] + yuvOffset16;
-						}
+						uAvg = u[uPos];
+						vAvg = v[uPos];
+						aAvg = a[uPos] + yuvOffset16;
 						// Yuv
 						g = y[yPos] + yuvOffset16 - ((uAvg + vAvg ) >> 2); // must be logical shift operator
 						buff[cnt + channelMap[1]] = Clamp8(g >> shift); 
 						buff[cnt + channelMap[2]] = Clamp8((uAvg + g) >> shift);
 						buff[cnt + channelMap[0]] = Clamp8((vAvg + g) >> shift);
 						buff[cnt + channelMap[3]] = Clamp8(aAvg >> shift);
-						yPos++; 
 						cnt += channels;
-						if (j%2) sampledPos++;
+						if (!m_downsample || (j & 1)) uPos++;
+						yPos++;
 					}
+					if (!m_downsample || (i & 1)) uOffset += uw;
+					yOffset += yw;
 					buff += pitch;
-					if (wOdd) sampledPos++;
 
 					if (cb) {
 						percent += dP;
@@ -2290,7 +2360,6 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			ASSERT(m_header.bpp == 32);
 
 			const int yuvOffset31 = 1 << (UsedBitsPerChannel() - 1);
-
 			DataT* y = m_channel[0]; ASSERT(y);
 
 			if (bpp == 32) {
@@ -2299,9 +2368,11 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				int pitch32 = pitch/4;
 
 				for (i=0; i < h; i++) {
-					for (j=0; j < w; j++) {
+					UINT32 yPos = yOffset;
+					for (j = 0; j < w; j++) {
 						buff32[j] = Clamp31((y[yPos++] + yuvOffset31) << shift);
 					}
+					yOffset += yw;
 					buff32 += pitch32;
 
 					if (cb) {
@@ -2317,9 +2388,11 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				if (usedBits < 16) {
 					const int shift = 16 - usedBits;
 					for (i=0; i < h; i++) {
-						for (j=0; j < w; j++) {
+						UINT32 yPos = yOffset;
+						for (j = 0; j < w; j++) {
 							buff16[j] = Clamp16((y[yPos++] + yuvOffset31) << shift);
 						}
+						yOffset += yw;
 						buff16 += pitch16;
 
 						if (cb) {
@@ -2330,9 +2403,11 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				} else {
 					const int shift = __max(0, usedBits - 16);
 					for (i=0; i < h; i++) {
-						for (j=0; j < w; j++) {
+						UINT32 yPos = yOffset;
+						for (j = 0; j < w; j++) {
 							buff16[j] = Clamp16((y[yPos++] + yuvOffset31) >> shift);
 						}
+						yOffset += yw;
 						buff16 += pitch16;
 
 						if (cb) {
@@ -2346,9 +2421,11 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 				const int shift = __max(0, UsedBitsPerChannel() - 8);
 				
 				for (i=0; i < h; i++) {
-					for (j=0; j < w; j++) {
+					UINT32 yPos = yOffset;
+					for (j = 0; j < w; j++) {
 						buff[j] = Clamp8((y[yPos++] + yuvOffset31) >> shift);
 					}
+					yOffset += yw;
 					buff += pitch;
 
 					if (cb) {
@@ -2371,15 +2448,16 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			DataT* u = m_channel[1]; ASSERT(u);
 			DataT* v = m_channel[2]; ASSERT(v);
 			UINT16 yval;
-			int cnt;
+			UINT32 cnt;
 
 			for (i=0; i < h; i++) {
+				UINT32 yPos = yOffset;
 				cnt = 0;
 				for (j=0; j < w; j++) {
 					// Yuv
 					uAvg = u[yPos];
 					vAvg = v[yPos];
-					yval = Clamp4(y[yPos++] + YUVoffset4 - ((uAvg + vAvg ) >> 2)); // must be logical shift operator
+					yval = Clamp4(y[yPos] + YUVoffset4 - ((uAvg + vAvg ) >> 2)); // must be logical shift operator
 					if (j%2 == 0) {
 						buff[cnt] = UINT8(Clamp4(vAvg + yval) | (yval << 4));
 						cnt++;
@@ -2390,7 +2468,9 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 						buff[cnt] = UINT8(yval | (Clamp4(uAvg + yval) << 4));
 						cnt++;
 					}
+					yPos++;
 				}
+				yOffset += yw;
 				buff += pitch;
 
 				if (cb) {
@@ -2415,13 +2495,15 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 			int pitch16 = pitch/2;
 
 			for (i=0; i < h; i++) {
-				for (j=0; j < w; j++) {
+				UINT32 yPos = yOffset;
+				for (j = 0; j < w; j++) {
 					// Yuv
 					uAvg = u[yPos];
 					vAvg = v[yPos];
 					yval = Clamp6(y[yPos++] + YUVoffset6 - ((uAvg + vAvg ) >> 2)); // must be logical shift operator
 					buff16[j] = (yval << 5) | ((Clamp6(uAvg + yval) >> 1) << 11) | (Clamp6(vAvg + yval) >> 1);
 				}
+				yOffset += yw;
 				buff16 += pitch16;
 
 				if (cb) {
@@ -2435,29 +2517,19 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 		ASSERT(false);
 	}
 
-#ifdef __PGFROISUPPORT__
-	if (targetBuff) {
-		// copy valid ROI (m_roi) from temporary buffer (roi) to target buffer
-		if (bpp%8 == 0) {
-			BYTE bypp = bpp/8;
-			buff = buffStart + (levelRoi.top - roi.top)*pitch + (levelRoi.left - roi.left)*bypp;
-			w = levelRoi.Width()*bypp;
-			h = levelRoi.Height();
-
-			for (i=0; i < h; i++) {
-				for (j=0; j < w; j++) {
-					targetBuff[j] = buff[j];
-				}
-				targetBuff += targetPitch;
-				buff += pitch;
-			}
-		} else {
-			// to do
-		}
-
-		delete[] buffStart; buffStart = 0;
+#ifdef _DEBUG
+	// display ROI (RGB) in debugger
+	roiimage.width = w;
+	roiimage.height = h;
+	if (pitch > 0) {
+		roiimage.pitch = pitch;
+		roiimage.data = buff;
+	} else {
+		roiimage.pitch = -pitch;
+		roiimage.data = buff + (h - 1)*pitch;
 	}
 #endif
+
 }			
 
 //////////////////////////////////////////////////////////////////////
@@ -2474,7 +2546,7 @@ void CPGFImage::GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] /*=
 /// @param bpp The number of bits per pixel used in image buffer.
 /// @param channelMap A integer array containing the mapping of PGF channel ordering to expected channel ordering.
 /// @param cb A pointer to a callback procedure. The procedure is called after each copied buffer row. If cb returns true, then it stops proceeding.
-void CPGFImage::GetYUV(int pitch, DataT* buff, BYTE bpp, int channelMap[] /*= NULL*/, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) const THROW_ {
+void CPGFImage::GetYUV(int pitch, DataT* buff, BYTE bpp, int channelMap[] /*= nullptr*/, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) const {
 	ASSERT(buff);
 	const UINT32 w = m_width[0];
 	const UINT32 h = m_height[0];
@@ -2485,7 +2557,7 @@ void CPGFImage::GetYUV(int pitch, DataT* buff, BYTE bpp, int channelMap[] /*= NU
 	const double dP = 1.0/h;
 
 	int defMap[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; ASSERT(sizeof(defMap)/sizeof(defMap[0]) == MaxChannels);
-	if (channelMap == NULL) channelMap = defMap;
+	if (channelMap == nullptr) channelMap = defMap;
 	int sampledPos = 0, yPos = 0;
 	DataT uAvg, vAvg;
 	double percent = 0;
@@ -2585,7 +2657,7 @@ void CPGFImage::GetYUV(int pitch, DataT* buff, BYTE bpp, int channelMap[] /*= NU
 /// @param bpp The number of bits per pixel used in image buffer.
 /// @param channelMap A integer array containing the mapping of input channel ordering to expected channel ordering.
 /// @param cb A pointer to a callback procedure. The procedure is called after each imported buffer row. If cb returns true, then it stops proceeding.
-void CPGFImage::ImportYUV(int pitch, DataT *buff, BYTE bpp, int channelMap[] /*= NULL*/, CallbackPtr cb /*= NULL*/, void *data /*=NULL*/) THROW_ {
+void CPGFImage::ImportYUV(int pitch, DataT *buff, BYTE bpp, int channelMap[] /*= nullptr*/, CallbackPtr cb /*= nullptr*/, void *data /*=nullptr*/) {
 	ASSERT(buff);
 	const double dP = 1.0/m_header.height;
 	const int dataBits = DataTSize*8; ASSERT(dataBits == 16 || dataBits == 32);
@@ -2596,7 +2668,7 @@ void CPGFImage::ImportYUV(int pitch, DataT *buff, BYTE bpp, int channelMap[] /*=
 	double percent = 0;
 	int defMap[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; ASSERT(sizeof(defMap)/sizeof(defMap[0]) == MaxChannels);
 
-	if (channelMap == NULL) channelMap = defMap;
+	if (channelMap == nullptr) channelMap = defMap;
 
 	if (m_header.channels == 3)	{
 		ASSERT(bpp%dataBits == 0);
diff --git a/scribus/third_party/pgf/PGFimage.h b/scribus/third_party/pgf/PGFimage.h
index eddd53e4f4b7415ce7dedb4aab55abae82fe5361..d2317b61759e6766f293d840402a4889c6f7cc02 100644
--- a/scribus/third_party/pgf/PGFimage.h
+++ b/scribus/third_party/pgf/PGFimage.h
@@ -31,10 +31,6 @@
 
 #include "PGFstream.h"
 
-//////////////////////////////////////////////////////////////////////
-// types
-enum ProgressMode { PM_Relative, PM_Absolute };
-
 //////////////////////////////////////////////////////////////////////
 // prototypes
 class CDecoder;
@@ -45,46 +41,40 @@ class CWaveletTransform;
 /// PGF image class is the main class. You always need a PGF object
 /// for encoding or decoding image data.
 /// Decoding:
-///		pgf.Open(...)
-///		pgf.Read(...)
-///		pgf.GetBitmap(...)
+///		Open()
+///		Read()
+///		GetBitmap()
 /// Encoding:
-///		pgf.SetHeader(...)
-///		pgf.ImportBitmap(...)
-///		pgf.Write(...)
+///		SetHeader()
+///		ImportBitmap()
+///		Write()
 /// @author C. Stamm, R. Spuler
 /// @brief PGF main class
 class CPGFImage {
 public:
 	
 	//////////////////////////////////////////////////////////////////////
-	/// Standard constructor: It is used to create a PGF instance for opening and reading.
+	/// Standard constructor
 	CPGFImage();
 
 	//////////////////////////////////////////////////////////////////////
-	/// Destructor: Destroy internal data structures.
+	/// Destructor
 	virtual ~CPGFImage();
 
 	//////////////////////////////////////////////////////////////////////
-	/// Close PGF image after opening and reading.
-	/// Destructor calls this method during destruction.
-	virtual void Close();
-
-	//////////////////////////////////////////////////////////////////////
-	/// Destroy internal data structures.
-	/// Destructor calls this method during destruction.
-	virtual void Destroy();
+	// Destroy internal data structures. Object state after this is the same as after CPGFImage().
+	void Destroy();
 
 	//////////////////////////////////////////////////////////////////////
 	/// Open a PGF image at current stream position: read pre-header, header, and ckeck image type.
 	/// Precondition: The stream has been opened for reading.
 	/// It might throw an IOException.
 	/// @param stream A PGF stream
-	void Open(CPGFStream* stream) THROW_;
+	void Open(CPGFStream* stream);
 
 	//////////////////////////////////////////////////////////////////////
-	/// Returns true if the PGF has been opened and not closed.
-	bool IsOpen() const	{ return m_decoder != NULL; }
+	/// Returns true if the PGF has been opened for reading.
+	bool IsOpen() const	{ return m_decoder != nullptr; }
 
 	//////////////////////////////////////////////////////////////////////
 	/// Read and decode some levels of a PGF image at current stream position.
@@ -98,7 +88,7 @@ public:
 	/// @param level [0, nLevels) The image level of the resulting image in the internal image buffer.
 	/// @param cb A pointer to a callback procedure. The procedure is called after reading a single level. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
-	void Read(int level = 0, CallbackPtr cb = NULL, void *data = NULL) THROW_;
+	void Read(int level = 0, CallbackPtr cb = nullptr, void *data = nullptr);
 
 #ifdef __PGFROISUPPORT__
 	//////////////////////////////////////////////////////////////////////
@@ -106,11 +96,11 @@ public:
 	/// The origin of the coordinate axis is the top-left corner of the image.
 	/// All coordinates are measured in pixels.
 	/// It might throw an IOException.
-	/// @param rect [inout] Rectangular region of interest (ROI). The rect might be cropped.
+	/// @param rect [inout] Rectangular region of interest (ROI) at level 0. The rect might be cropped.
 	/// @param level [0, nLevels) The image level of the resulting image in the internal image buffer.
 	/// @param cb A pointer to a callback procedure. The procedure is called after reading a single level. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
-	void Read(PGFRect& rect, int level = 0, CallbackPtr cb = NULL, void *data = NULL) THROW_;
+	void Read(PGFRect& rect, int level = 0, CallbackPtr cb = nullptr, void *data = nullptr);
 #endif
 
 	//////////////////////////////////////////////////////////////////////
@@ -118,14 +108,14 @@ public:
 	/// For details, please refert to Read(...)
 	/// Precondition: The PGF image has been opened with a call of Open(...).
 	/// It might throw an IOException.
-	void ReadPreview() THROW_										{ Read(Levels() - 1); }
+	void ReadPreview()										{ Read(Levels() - 1); }
 
 	//////////////////////////////////////////////////////////////////////
 	/// After you've written a PGF image, you can call this method followed by GetBitmap/GetYUV
 	/// to get a quick reconstruction (coded -> decoded image).
 	/// It might throw an IOException.
 	/// @param level The image level of the resulting image in the internal image buffer.
-	void Reconstruct(int level = 0) THROW_;
+	void Reconstruct(int level = 0);
 
 	//////////////////////////////////////////////////////////////////////
 	/// Get image data in interleaved format: (ordering of RGB data is BGR[A])
@@ -144,7 +134,7 @@ public:
 	/// @param channelMap A integer array containing the mapping of PGF channel ordering to expected channel ordering.
 	/// @param cb A pointer to a callback procedure. The procedure is called after each copied buffer row. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
-	void GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] = NULL, CallbackPtr cb = NULL, void *data = NULL) const THROW_; // throws IOException
+	void GetBitmap(int pitch, UINT8* buff, BYTE bpp, int channelMap[] = nullptr, CallbackPtr cb = nullptr, void *data = nullptr) const; // throws IOException
 
 	//////////////////////////////////////////////////////////////////////
 	/// Get YUV image data in interleaved format: (ordering is YUV[A])
@@ -161,7 +151,7 @@ public:
 	/// @param channelMap A integer array containing the mapping of PGF channel ordering to expected channel ordering.
 	/// @param cb A pointer to a callback procedure. The procedure is called after each copied buffer row. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
-	void GetYUV(int pitch, DataT* buff, BYTE bpp, int channelMap[] = NULL, CallbackPtr cb = NULL, void *data = NULL) const THROW_; // throws IOException
+	void GetYUV(int pitch, DataT* buff, BYTE bpp, int channelMap[] = nullptr, CallbackPtr cb = nullptr, void *data = nullptr) const; // throws IOException
 
 	//////////////////////////////////////////////////////////////////////
 	/// Import an image from a specified image buffer.
@@ -179,7 +169,7 @@ public:
 	/// @param channelMap A integer array containing the mapping of input channel ordering to expected channel ordering.
 	/// @param cb A pointer to a callback procedure. The procedure is called after each imported buffer row. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
-	void ImportBitmap(int pitch, UINT8 *buff, BYTE bpp, int channelMap[] = NULL, CallbackPtr cb = NULL, void *data = NULL) THROW_;
+	void ImportBitmap(int pitch, UINT8 *buff, BYTE bpp, int channelMap[] = nullptr, CallbackPtr cb = nullptr, void *data = nullptr);
 
 	//////////////////////////////////////////////////////////////////////
 	/// Import a YUV image from a specified image buffer.
@@ -196,10 +186,10 @@ public:
 	/// @param channelMap A integer array containing the mapping of input channel ordering to expected channel ordering.
 	/// @param cb A pointer to a callback procedure. The procedure is called after each imported buffer row. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
-	void ImportYUV(int pitch, DataT *buff, BYTE bpp, int channelMap[] = NULL, CallbackPtr cb = NULL, void *data = NULL) THROW_;
+	void ImportYUV(int pitch, DataT *buff, BYTE bpp, int channelMap[] = nullptr, CallbackPtr cb = nullptr, void *data = nullptr);
 
 	//////////////////////////////////////////////////////////////////////
-	/// Encode and write a entire PGF image (header and image) at current stream position.
+	/// Encode and write an entire PGF image (header and image) at current stream position.
 	/// A PGF image is structered in levels, numbered between 0 and Levels() - 1.
 	/// Each level can be seen as a single image, containing the same content
 	/// as all other levels, but in a different size (width, height).
@@ -211,7 +201,7 @@ public:
 	/// @param nWrittenBytes [in-out] The number of bytes written into stream are added to the input value.
 	/// @param cb A pointer to a callback procedure. The procedure is called after writing a single level. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
-	void Write(CPGFStream* stream, UINT32* nWrittenBytes = NULL, CallbackPtr cb = NULL, void *data = NULL) THROW_;
+	void Write(CPGFStream* stream, UINT32* nWrittenBytes = nullptr, CallbackPtr cb = nullptr, void *data = nullptr);
 
 	//////////////////////////////////////////////////////////////////
 	/// Create wavelet transform channels and encoder. Write header at current stream position.
@@ -220,10 +210,10 @@ public:
 	/// It might throw an IOException.
 	/// @param stream A PGF stream
 	/// @return The number of bytes written into stream.
-	UINT32 WriteHeader(CPGFStream* stream) THROW_;
+	UINT32 WriteHeader(CPGFStream* stream);
 
 	//////////////////////////////////////////////////////////////////////
-	/// Encode and write the one and only image at current stream position.
+	/// Encode and write an image at current stream position.
 	/// Call this method after WriteHeader(). In case you want to write uncached metadata, 
 	/// then do that after WriteHeader() and before WriteImage(). 
 	/// This method is called inside of Write(stream, ...).
@@ -232,7 +222,7 @@ public:
 	/// @param cb A pointer to a callback procedure. The procedure is called after writing a single level. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
 	/// @return The number of bytes written into stream.
-	UINT32 WriteImage(CPGFStream* stream, CallbackPtr cb = NULL, void *data = NULL) THROW_;
+	UINT32 WriteImage(CPGFStream* stream, CallbackPtr cb = nullptr, void *data = nullptr);
 
 #ifdef __PGFROISUPPORT__
 	//////////////////////////////////////////////////////////////////
@@ -250,7 +240,7 @@ public:
 	/// @param cb A pointer to a callback procedure. The procedure is called after writing a single level. If cb returns true, then it stops proceeding.
 	/// @param data Data Pointer to C++ class container to host callback procedure.
 	/// @return The number of bytes written into stream.
-	UINT32 Write(int level, CallbackPtr cb = NULL, void *data = NULL) THROW_;
+	UINT32 Write(int level, CallbackPtr cb = nullptr, void *data = nullptr);
 #endif
 
 	/////////////////////////////////////////////////////////////////////
@@ -262,12 +252,18 @@ public:
 	/////////////////////////////////////////////////////////////////////
 	/// Configures the decoder.
 	/// @param useOMP Use parallel threading with Open MP during decoding. Default value: true. Influences the decoding only if the codec has been compiled with OpenMP support.
-	/// @param skipUserData The file might contain user data (metadata). User data ist usually read during Open and stored in memory. Set this flag to false when storing in memory is not needed.
-	void ConfigureDecoder(bool useOMP = true, bool skipUserData = false) { m_useOMPinDecoder = useOMP; m_skipUserData = skipUserData; }
+	/// @param policy The file might contain user data (e.g. metadata). The policy defines the behaviour during Open(). 
+	///               UP_CacheAll:    User data is read and stored completely in a new allocated memory block. It can be accessed by GetUserData().
+	///               UP_CachePrefix: Only prefixSize bytes at the beginning of the user data are stored in a new allocated memory block. It can be accessed by GetUserData().
+	///               UP_Skip:        User data is skipped and nothing is cached. 
+	/// @param prefixSize Is only used in combination with UP_CachePrefix. It defines the number of bytes cached.
+	void ConfigureDecoder(bool useOMP = true, UserdataPolicy policy = UP_CacheAll, UINT32 prefixSize = 0) { ASSERT(prefixSize <= MaxUserDataSize);  m_useOMPinDecoder = useOMP; m_userDataPolicy = (UP_CachePrefix) ? prefixSize : 0xFFFFFFFF - policy; }
 
 	////////////////////////////////////////////////////////////////////
-	/// Reset stream position to start of PGF pre-header
-	void ResetStreamPos() THROW_;
+	/// Reset stream position to start of PGF pre-header or start of data. Must not be called before Open() or before Write(). 
+	/// Use this method after Read() if you want to read the same image several times, e.g. reading different ROIs.
+	/// @param startOfData true: you want to read the same image several times. false: resets stream position to the initial position
+	void ResetStreamPos(bool startOfData);
 
 	//////////////////////////////////////////////////////////////////////
 	/// Set internal PGF image buffer channel.
@@ -277,13 +273,13 @@ public:
 
 	//////////////////////////////////////////////////////////////////////
 	/// Set PGF header and user data.
-	/// Precondition: The PGF image has been closed with Close(...) or never opened with Open(...).
+	/// Precondition: The PGF image has been never opened with Open(...).
 	/// It might throw an IOException.
 	/// @param header A valid and already filled in PGF header structure
 	/// @param flags A combination of additional version flags. In case you use level-wise encoding then set flag = PGFROI.
 	/// @param userData A user-defined memory block containing any kind of cached metadata.
 	/// @param userDataLength The size of user-defined memory block in bytes
-	void SetHeader(const PGFHeader& header, BYTE flags = 0, UINT8* userData = 0, UINT32 userDataLength = 0) THROW_; // throws IOException
+	void SetHeader(const PGFHeader& header, BYTE flags = 0, const UINT8* userData = 0, UINT32 userDataLength = 0); // throws IOException
 
 	//////////////////////////////////////////////////////////////////////
 	/// Set maximum intensity value for image modes with more than eight bits per channel.
@@ -312,7 +308,7 @@ public:
 	/// @param iFirstColor The color table index of the first entry to set.
 	/// @param nColors The number of color table entries to set.
 	/// @param prgbColors A pointer to the array of RGBQUAD structures to set the color table entries.
-	void SetColorTable(UINT32 iFirstColor, UINT32 nColors, const RGBQUAD* prgbColors) THROW_;
+	void SetColorTable(UINT32 iFirstColor, UINT32 nColors, const RGBQUAD* prgbColors);
 
 	//////////////////////////////////////////////////////////////////////
 	/// Return an internal YUV image channel.
@@ -326,7 +322,7 @@ public:
 	/// @param iFirstColor The color table index of the first entry to retrieve.
 	/// @param nColors The number of color table entries to retrieve.
 	/// @param prgbColors A pointer to the array of RGBQUAD structures to retrieve the color table entries.
-	void GetColorTable(UINT32 iFirstColor, UINT32 nColors, RGBQUAD* prgbColors) const THROW_;
+	void GetColorTable(UINT32 iFirstColor, UINT32 nColors, RGBQUAD* prgbColors) const;
 
 	//////////////////////////////////////////////////////////////////////
 	// Returns address of internal color table
@@ -352,9 +348,10 @@ public:
 	//////////////////////////////////////////////////////////////////////
 	/// Return user data and size of user data.
 	/// Precondition: The PGF image has been opened with a call of Open(...).
-	/// @param size [out] Size of user data in bytes.
-	/// @return A pointer to user data or NULL if there is no user data.
-	const UINT8* GetUserData(UINT32& size) const;
+	/// @param cachedSize [out] Size of returned user data in bytes.
+	/// @param pTotalSize [optional out] Pointer to return the size of user data stored in image header in bytes.
+	/// @return A pointer to user data or nullptr if there is no user data available.
+	const UINT8* GetUserData(UINT32& cachedSize, UINT32* pTotalSize = nullptr) const;
 
 	//////////////////////////////////////////////////////////////////////
 	/// Return the length of all encoded headers in bytes.
@@ -370,13 +367,13 @@ public:
 	UINT32 GetEncodedLevelLength(int level) const					{ ASSERT(level >= 0 && level < m_header.nLevels); return m_levelLength[m_header.nLevels - level - 1]; }
 
 	//////////////////////////////////////////////////////////////////////
-	/// Reads the encoded PGF headers and copies it to a target buffer.
+	/// Reads the encoded PGF header and copies it to a target buffer.
 	/// Precondition: The PGF image has been opened with a call of Open(...).
 	/// It might throw an IOException.
 	/// @param target The target buffer
 	/// @param targetLen The length of the target buffer in bytes
 	/// @return The number of bytes copied to the target buffer
-	UINT32 ReadEncodedHeader(UINT8* target, UINT32 targetLen) const THROW_;
+	UINT32 ReadEncodedHeader(UINT8* target, UINT32 targetLen) const;
 
 	//////////////////////////////////////////////////////////////////////
 	/// Reads the data of an encoded PGF level and copies it to a target buffer 
@@ -387,7 +384,7 @@ public:
 	/// @param target The target buffer
 	/// @param targetLen The length of the target buffer in bytes
 	/// @return The number of bytes copied to the target buffer
-	UINT32 ReadEncodedData(int level, UINT8* target, UINT32 targetLen) const THROW_;
+	UINT32 ReadEncodedData(int level, UINT8* target, UINT32 targetLen) const;
 
 	//////////////////////////////////////////////////////////////////////
 	/// Return current image width of given channel in pixels.
@@ -406,21 +403,21 @@ public:
 	//////////////////////////////////////////////////////////////////////
 	/// Return bits per channel of the image's encoder.
 	/// @return Bits per channel
-	BYTE ChannelDepth() const										{ return CurrentChannelDepth(m_preHeader.version); }
+	BYTE ChannelDepth() const										{ return MaxChannelDepth(m_preHeader.version); }
 
 	//////////////////////////////////////////////////////////////////////
 	/// Return image width of channel 0 at given level in pixels.
 	/// The returned width is independent of any Read-operations and ROI.
 	/// @param level A level
 	/// @return Image level width in pixels
-	UINT32 Width(int level = 0) const								{ ASSERT(level >= 0); return LevelWidth(m_header.width, level); }
+	UINT32 Width(int level = 0) const								{ ASSERT(level >= 0); return LevelSizeL(m_header.width, level); }
 
 	//////////////////////////////////////////////////////////////////////
 	/// Return image height of channel 0 at given level in pixels.
 	/// The returned height is independent of any Read-operations and ROI.
 	/// @param level A level
 	/// @return Image level height in pixels
-	UINT32 Height(int level = 0) const								{ ASSERT(level >= 0); return LevelHeight(m_header.height, level); }
+	UINT32 Height(int level = 0) const								{ ASSERT(level >= 0); return LevelSizeL(m_header.height, level); }
 
 	//////////////////////////////////////////////////////////////////////
 	/// Return current image level. 
@@ -434,6 +431,10 @@ public:
 	/// @return Number of image levels
 	BYTE Levels() const												{ return m_header.nLevels; }
 
+	//////////////////////////////////////////////////////////////////////
+	/// Return true if all levels have been read 
+	bool IsFullyRead() const										{ return m_currentLevel == 0; }
+
 	//////////////////////////////////////////////////////////////////////
 	/// Return the PGF quality. The quality is inbetween 0 and MaxQuality.
 	/// PGF quality 0 means lossless quality.
@@ -464,6 +465,13 @@ public:
 	/// @return true if the pgf image supports ROI.
 	bool ROIisSupported() const										{ return (m_preHeader.version & PGFROI) == PGFROI; }
 
+#ifdef __PGFROISUPPORT__
+	/// Return ROI of channel 0 at current level in pixels.
+	/// The returned rect is only valid after reading a ROI.
+	/// @return ROI in pixels
+	PGFRect ComputeLevelROI() const;
+#endif
+
 	//////////////////////////////////////////////////////////////////////
 	/// Returns number of used bits per input/output image channel.
 	/// Precondition: header must be initialized.
@@ -471,9 +479,9 @@ public:
 	BYTE UsedBitsPerChannel() const;
 
 	//////////////////////////////////////////////////////////////////////
-	/// Returns images' PGF version
-	/// @return PGF codec version of the image
-	BYTE Version() const											{ return CurrentVersion(m_preHeader.version); }
+	/// Returns the used codec major version of a pgf image
+	/// @return PGF codec major version of this image
+	BYTE Version() const											{ BYTE ver = CodecMajorVersion(m_preHeader.version); return (ver <= 7) ? ver : (BYTE)m_header.version.major; }
 
 	//class methods
 
@@ -484,28 +492,30 @@ public:
 	static bool ImportIsSupported(BYTE mode);
 
 	//////////////////////////////////////////////////////////////////////
-	/// Compute and return image width at given level.
-	/// @param width Original image width (at level 0)
+	/// Compute and return image width/height of LL subband at given level.
+	/// @param size Original image size (e.g. width or height at level 0)
 	/// @param level An image level
-	/// @return Image level width in pixels
-	static UINT32 LevelWidth(UINT32 width, int level)				{ ASSERT(level >= 0); UINT32 w = (width >> level); return ((w << level) == width) ? w : w + 1; }
+	/// @return Image width/height at given level in pixels
+	static UINT32 LevelSizeL(UINT32 size, int level)				{ ASSERT(level >= 0); UINT32 d = 1 << level; return (size + d - 1) >> level; }
 
 	//////////////////////////////////////////////////////////////////////
-	/// Compute and return image height at given level.
-	/// @param height Original image height (at level 0)
+	/// Compute and return image width/height of HH subband at given level.
+	/// @param size Original image size (e.g. width or height at level 0)
 	/// @param level An image level
-	/// @return Image level height in pixels
-	static UINT32 LevelHeight(UINT32 height, int level)				{ ASSERT(level >= 0); UINT32 h = (height >> level); return ((h << level) == height) ? h : h + 1; }
+	/// @return high pass size at given level in pixels
+	static UINT32 LevelSizeH(UINT32 size, int level)				{ ASSERT(level >= 0); UINT32 d = 1 << (level - 1); return (size + d - 1) >> level; }
 
 	//////////////////////////////////////////////////////////////////////
-	/// Compute and return codec version.
-	/// @return current PGF codec version
-	static BYTE CurrentVersion(BYTE version = PGFVersion);
+	/// Return codec major version.
+	/// @param version pgf pre-header version number
+	/// @return PGF major of given version
+	static BYTE CodecMajorVersion(BYTE version = PGFVersion);
 
 	//////////////////////////////////////////////////////////////////////
-	/// Compute and return codec version.
-	/// @return current PGF codec version
-	static BYTE CurrentChannelDepth(BYTE version = PGFVersion)		{ return (version & PGF32) ? 32 : 16; }
+	/// Return maximum channel depth.
+	/// @param version pgf pre-header version number
+	/// @return maximum channel depth in bit of given version (16 or 32 bit)
+	static BYTE MaxChannelDepth(BYTE version = PGFVersion)			{ return (version & PGF32) ? 32 : 16; }
 
 protected:
 	CWaveletTransform* m_wtChannel[MaxChannels];	///< wavelet transformed color channels
@@ -520,12 +530,12 @@ protected:
 	PGFPostHeader m_postHeader;		///< PGF post-header
 	UINT64 m_userDataPos;			///< stream position of user data
 	int m_currentLevel;				///< transform level of current image
+	UINT32 m_userDataPolicy;		///< user data (metadata) policy during open
 	BYTE m_quant;					///< quantization parameter
 	bool m_downsample;				///< chrominance channels are downsampled
 	bool m_favorSpeedOverSize;		///< favor encoding speed over compression ratio
 	bool m_useOMPinEncoder;			///< use Open MP in encoder
 	bool m_useOMPinDecoder;			///< use Open MP in decoder
-	bool m_skipUserData;			///< skip user data (metadata) during open
 #ifdef __PGFROISUPPORT__
 	bool m_streamReinitialized;		///< stream has been reinitialized
 	PGFRect m_roi;					///< region of interest
@@ -537,14 +547,16 @@ private:
 	double m_percent;				///< progress [0..1]
 	ProgressMode m_progressMode;	///< progress mode used in Read and Write; PM_Relative is default mode
 
+	void Init();
 	void ComputeLevels();
-	void CompleteHeader();
-	void RgbToYuv(int pitch, UINT8* rgbBuff, BYTE bpp, int channelMap[], CallbackPtr cb, void *data) THROW_;
+	bool CompleteHeader();
+	void RgbToYuv(int pitch, UINT8* rgbBuff, BYTE bpp, int channelMap[], CallbackPtr cb, void *data);
 	void Downsample(int nChannel);
-	UINT32 UpdatePostHeaderSize() THROW_;
-	void WriteLevel() THROW_;
+	UINT32 UpdatePostHeaderSize();
+	void WriteLevel();
 
 #ifdef __PGFROISUPPORT__
+	PGFRect GetAlignedROI(int c = 0) const;
 	void SetROI(PGFRect rect);
 #endif
 
diff --git a/scribus/third_party/pgf/PGFplatform.h b/scribus/third_party/pgf/PGFplatform.h
index c3e3ed0457e3f6db10f893f89f81cfaed1fb8b34..22634ac9fb0f81dcfa48413e90d564c27a309694 100644
--- a/scribus/third_party/pgf/PGFplatform.h
+++ b/scribus/third_party/pgf/PGFplatform.h
@@ -1,637 +1,631 @@
-/*
- * The Progressive Graphics File; http://www.libpgf.org
- * 
- * $Date: 2007-06-12 19:27:47 +0200 (Di, 12 Jun 2007) $
- * $Revision: 307 $
- * 
- * This file Copyright (C) 2006 xeraina GmbH, Switzerland
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU LESSER GENERAL PUBLIC LICENSE
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- * 
- * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-//////////////////////////////////////////////////////////////////////
-/// @file PGFplatform.h
-/// @brief PGF platform specific definitions
-/// @author C. Stamm
-
-#ifndef PGF_PGFPLATFORM_H
-#define PGF_PGFPLATFORM_H
-
-#include <cassert>
-#include <cmath>
-#include <cstdlib>
-
-//-------------------------------------------------------------------------------
-// Endianess detection taken from lcms2 header.
-// This list can be endless, so only some checks are performed over here.
-//-------------------------------------------------------------------------------
-#if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(WORDS_BIGENDIAN)
-#define PGF_USE_BIG_ENDIAN 1
-#endif
-
-#if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(__sparc) || defined(__sparc__)
-#define PGF_USE_BIG_ENDIAN 1
-#endif
-
-#if defined(__ppc__) || defined(__s390__) || defined(__s390x__)
-#define PGF_USE_BIG_ENDIAN 1
-#endif
-
-#ifdef TARGET_CPU_PPC
-#define PGF_USE_BIG_ENDIAN 1
-#endif
-
-//-------------------------------------------------------------------------------
-// ROI support
-//-------------------------------------------------------------------------------
-#ifndef NPGFROI
-#define __PGFROISUPPORT__ // without ROI support the program code gets simpler and smaller
-#endif
-
-//-------------------------------------------------------------------------------
-// 32 bit per channel support
-//-------------------------------------------------------------------------------
-#ifndef NPGF32
-#define __PGF32SUPPORT__ // without 32 bit the memory consumption during encoding and decoding is much lesser
-#endif
-
-//-------------------------------------------------------------------------------
-//	32 Bit platform constants
-//-------------------------------------------------------------------------------
-#define WordWidth			32					///< WordBytes*8
-#define WordWidthLog		5					///< ld of WordWidth
-#define WordMask			0xFFFFFFE0			///< least WordWidthLog bits are zero
-#define WordBytes			4					///< sizeof(UINT32)
-#define WordBytesMask		0xFFFFFFFC			///< least WordBytesLog bits are zero
-#define WordBytesLog		2					///< ld of WordBytes
-
-//-------------------------------------------------------------------------------
-// Alignment macros (used in PGF based libraries)
-//-------------------------------------------------------------------------------
-#define DWWIDTHBITS(bits)	(((bits) + WordWidth - 1) & WordMask)		///< aligns scanline width in bits to DWORD value
-#define DWWIDTH(bytes)		(((bytes) + WordBytes - 1) & WordBytesMask)	///< aligns scanline width in bytes to DWORD value
-#define DWWIDTHREST(bytes)	((WordBytes - (bytes)%WordBytes)%WordBytes)	///< DWWIDTH(bytes) - bytes
-
-//-------------------------------------------------------------------------------
-// Min-Max macros
-//-------------------------------------------------------------------------------
-#ifndef __min
-	#define __min(x, y)		((x) <= (y) ? (x) : (y))
-	#define __max(x, y)		((x) >= (y) ? (x) : (y))
-#endif // __min
-
-//-------------------------------------------------------------------------------
-//	Defines -- Adobe image modes.
-//-------------------------------------------------------------------------------
-#define ImageModeBitmap				0
-#define ImageModeGrayScale			1
-#define ImageModeIndexedColor		2
-#define ImageModeRGBColor			3
-#define ImageModeCMYKColor			4
-#define ImageModeHSLColor			5
-#define ImageModeHSBColor			6
-#define ImageModeMultichannel		7
-#define ImageModeDuotone			8
-#define ImageModeLabColor			9
-#define ImageModeGray16				10		// 565
-#define ImageModeRGB48				11
-#define ImageModeLab48				12
-#define ImageModeCMYK64				13
-#define ImageModeDeepMultichannel	14
-#define ImageModeDuotone16			15
-// pgf extension
-#define ImageModeRGBA				17
-#define ImageModeGray32				18		// MSB is 0 (can be interpreted as signed 15.16 fixed point format)
-#define ImageModeRGB12				19
-#define ImageModeRGB16				20
-#define ImageModeUnknown			255
-
-
-//-------------------------------------------------------------------------------
-// WINDOWS 
-//-------------------------------------------------------------------------------
-#if defined(WIN32) || defined(WINCE) || defined(WIN64)
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-
-//-------------------------------------------------------------------------------
-// MFC
-//-------------------------------------------------------------------------------
-#ifdef _MFC_VER
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-#include <afx.h>
-
-#else
-
-#include <windows.h>
-#include <ole2.h>
-
-#endif // _MFC_VER 
-//-------------------------------------------------------------------------------
-
-#define DllExport   __declspec( dllexport ) 
-
-//-------------------------------------------------------------------------------
-// unsigned number type definitions
-//-------------------------------------------------------------------------------
-typedef unsigned char		UINT8;
-typedef unsigned char		BYTE;
-typedef unsigned short		UINT16;
-typedef unsigned short      WORD;
-typedef	unsigned int		UINT32;
-typedef unsigned long       DWORD;
-typedef unsigned long       ULONG;
-typedef unsigned __int64	UINT64; 
-typedef unsigned __int64	ULONGLONG; 
-
-//-------------------------------------------------------------------------------
-// signed number type definitions
-//-------------------------------------------------------------------------------
-typedef signed char			INT8;
-typedef signed short		INT16;
-typedef signed int			INT32;
-typedef signed int			BOOL;
-typedef signed long			LONG;
-typedef signed __int64		INT64;
-typedef signed __int64		LONGLONG;
-
-//-------------------------------------------------------------------------------
-// other types
-//-------------------------------------------------------------------------------
-typedef int OSError;
-typedef bool (__cdecl *CallbackPtr)(double percent, bool escapeAllowed, void *data);
-
-//-------------------------------------------------------------------------------
-// struct type definitions
-//-------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------
-// DEBUG macros
-//-------------------------------------------------------------------------------
-#ifndef ASSERT
-	#ifdef _DEBUG
-		#define ASSERT(x)	assert(x)
-	#else
-		#if defined(__GNUC__) 
-			#define ASSERT(ignore)((void) 0) 
-		#elif _MSC_VER >= 1300 
-			#define ASSERT		__noop
-		#else
-			#define ASSERT ((void)0)
-		#endif
-	#endif //_DEBUG
-#endif //ASSERT
-
-//-------------------------------------------------------------------------------
-// Exception handling macros
-//-------------------------------------------------------------------------------
-#ifdef NEXCEPTIONS
-	extern OSError _PGF_Error_;
-	extern OSError GetLastPGFError();
-
-	#define ReturnWithError(err) { _PGF_Error_ = err; return; }
-	#define ReturnWithError2(err, ret) { _PGF_Error_ = err; return ret; }
-#else
-	#define ReturnWithError(err) throw IOException(err)
-	#define ReturnWithError2(err, ret) throw IOException(err)
-#endif //NEXCEPTIONS
-
-#if _MSC_VER >= 1300
-	//#define THROW_ throw(...)
-	#pragma warning( disable : 4290 )
-	#define THROW_ throw(IOException)
-#else
-	#define THROW_
-#endif
-
-//-------------------------------------------------------------------------------
-// constants
-//-------------------------------------------------------------------------------
-#define FSFromStart		FILE_BEGIN				// 0
-#define FSFromCurrent	FILE_CURRENT			// 1
-#define FSFromEnd		FILE_END				// 2
-
-#define INVALID_SET_FILE_POINTER ((DWORD)-1)
-
-//-------------------------------------------------------------------------------
-// IO Error constants
-//-------------------------------------------------------------------------------
-#define NoError				ERROR_SUCCESS		///< no error
-#define AppError			0x20000000			///< all application error messages must be larger than this value
-#define InsufficientMemory	0x20000001			///< memory allocation wasn't successfull
-#define InvalidStreamPos	0x20000002			///< invalid memory stream position
-#define EscapePressed		0x20000003			///< user break by ESC
-#define WrongVersion		0x20000004			///< wrong pgf version 
-#define FormatCannotRead	0x20000005			///< wrong data file format
-#define ImageTooSmall		0x20000006			///< image is too small
-#define ZlibError			0x20000007			///< error in zlib functions
-#define ColorTableError		0x20000008			///< errors related to color table size
-#define PNGError			0x20000009			///< errors in png functions
-#define MissingData			0x2000000A			///< expected data cannot be read
-
-//-------------------------------------------------------------------------------
-// methods
-//-------------------------------------------------------------------------------
-inline OSError FileRead(HANDLE hFile, int *count, void *buffPtr) {
-	if (ReadFile(hFile, buffPtr, *count, (ULONG *)count, NULL)) {
-		return NoError;
-	} else {
-		return GetLastError();
-	}
-}
-
-inline OSError FileWrite(HANDLE hFile, int *count, void *buffPtr) {
-	if (WriteFile(hFile, buffPtr, *count, (ULONG *)count, NULL)) {
-		return NoError;
-	} else {
-		return GetLastError();
-	}
-}
-
-inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
-#ifdef WINCE
-	LARGE_INTEGER li;
-	li.QuadPart = 0;
-
-	li.LowPart = SetFilePointer (hFile, li.LowPart, &li.HighPart, FILE_CURRENT);
-	if (li.LowPart == INVALID_SET_FILE_POINTER) {
-		OSError err = GetLastError();
-		if (err != NoError) {
-			return err;
-		}
-	}
-	*pos = li.QuadPart;
-	return NoError;
-#else
-	LARGE_INTEGER li;
-	li.QuadPart = 0;
-	if (SetFilePointerEx(hFile, li, (PLARGE_INTEGER)pos, FILE_CURRENT)) {
-		return NoError;
-	} else {
-		return GetLastError();
-	}
-#endif
-}
-
-inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
-#ifdef WINCE
-	LARGE_INTEGER li;
-	li.QuadPart = posOff;
-
-	if (SetFilePointer (hFile, li.LowPart, &li.HighPart, posMode) == INVALID_SET_FILE_POINTER) {
-		OSError err = GetLastError();
-		if (err != NoError) {
-			return err;
-		}
-	}
-	return NoError;
-#else
-	LARGE_INTEGER li;
-	li.QuadPart = posOff;
-	if (SetFilePointerEx(hFile, li, NULL, posMode)) {
-		return NoError;
-	} else {
-		return GetLastError();
-	}
-#endif
-}
-#endif //WIN32
-
-
-//-------------------------------------------------------------------------------
-// Apple OSX
-//-------------------------------------------------------------------------------
-#ifdef __APPLE__
-#define __POSIX__ 
-#endif // __APPLE__
-
-
-//-------------------------------------------------------------------------------
-// LINUX
-//-------------------------------------------------------------------------------
-#if defined(__linux__) || defined(__GLIBC__)
-#define __POSIX__
-#endif // __linux__ or __GLIBC__
-
-
-//-------------------------------------------------------------------------------
-// SOLARIS
-//-------------------------------------------------------------------------------
-#ifdef __sun
-#define __POSIX__
-#endif // __sun
-
-
-//-------------------------------------------------------------------------------
-// *BSD and Haiku
-//-------------------------------------------------------------------------------
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__HAIKU__)
-#ifndef __POSIX__ 
-#define __POSIX__ 
-#endif 
-
-#ifndef off64_t 
-#define off64_t off_t 
-#endif 
-
-#ifndef lseek64 
-#define lseek64 lseek 
-#endif 
-
-#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__ or __HAIKU__
-
-
-//-------------------------------------------------------------------------------
-// POSIX *NIXes
-//-------------------------------------------------------------------------------
-
-#ifdef __POSIX__
-#include <unistd.h>
-#include <errno.h>
-#include <stdint.h>		// for int64_t and uint64_t
-#include <string.h>		// memcpy()
-
-//-------------------------------------------------------------------------------
-// unsigned number type definitions
-//-------------------------------------------------------------------------------
-
-typedef unsigned char		UINT8;
-typedef unsigned char		BYTE;
-typedef unsigned short		UINT16;
-typedef unsigned short		WORD;
-typedef unsigned int		UINT32;
-typedef unsigned int		DWORD;
-typedef unsigned long		ULONG;
-typedef unsigned long long  __Uint64;
-typedef __Uint64			UINT64;
-typedef __Uint64			ULONGLONG;
-
-//-------------------------------------------------------------------------------
-// signed number type definitions
-//-------------------------------------------------------------------------------
-typedef signed char			INT8;
-typedef signed short		INT16;
-typedef signed int			INT32;
-typedef signed int			BOOL;
-typedef signed long			LONG;
-typedef int64_t				INT64;
-typedef int64_t				LONGLONG;
-
-//-------------------------------------------------------------------------------
-// other types
-//-------------------------------------------------------------------------------
-typedef int					OSError;
-typedef int					HANDLE;	
-typedef unsigned long		ULONG_PTR;
-typedef void*				PVOID;
-typedef char*				LPTSTR;
-typedef bool (*CallbackPtr)(double percent, bool escapeAllowed, void *data);
-
-//-------------------------------------------------------------------------------
-// struct type definitions
-//-------------------------------------------------------------------------------
-typedef struct tagRGBTRIPLE {
-	BYTE rgbtBlue;
-	BYTE rgbtGreen;
-	BYTE rgbtRed;
-} RGBTRIPLE;
-
-typedef struct tagRGBQUAD {
-	BYTE rgbBlue;
-	BYTE rgbGreen;
-	BYTE rgbRed;
-	BYTE rgbReserved;
-} RGBQUAD;
-
-typedef union _LARGE_INTEGER {
-  struct {
-    DWORD LowPart;
-    LONG HighPart;
-  } u;
-  LONGLONG QuadPart;
-} LARGE_INTEGER, *PLARGE_INTEGER;
-#endif // __POSIX__
-
-
-#if defined(__POSIX__) || defined(WINCE)
-// CMYK macros
-#define GetKValue(cmyk)      ((BYTE)(cmyk))
-#define GetYValue(cmyk)      ((BYTE)((cmyk)>> 8))
-#define GetMValue(cmyk)      ((BYTE)((cmyk)>>16))
-#define GetCValue(cmyk)      ((BYTE)((cmyk)>>24))
-#define CMYK(c,m,y,k)		 ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
-
-//-------------------------------------------------------------------------------
-// methods
-//-------------------------------------------------------------------------------
-/* The MulDiv function multiplies two 32-bit values and then divides the 64-bit 
- * result by a third 32-bit value. The return value is rounded up or down to 
- * the nearest integer.
- * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winprog/winprog/muldiv.asp
- * */
-__inline int MulDiv(int nNumber, int nNumerator, int nDenominator) {
-	INT64 multRes = nNumber*nNumerator;
-	INT32 divRes = INT32(multRes/nDenominator);
-	return divRes;
-}
-#endif // __POSIX__ or WINCE
-
-
-#ifdef __POSIX__
-//-------------------------------------------------------------------------------
-// DEBUG macros
-//-------------------------------------------------------------------------------
-#ifndef ASSERT
-	#ifdef _DEBUG
-		#define ASSERT(x)	assert(x)
-	#else
-		#define ASSERT(x)	
-	#endif //_DEBUG
-#endif //ASSERT
-
-//-------------------------------------------------------------------------------
-// Exception handling macros
-//-------------------------------------------------------------------------------
-#ifdef NEXCEPTIONS
-	extern OSError _PGF_Error_;
-	extern OSError GetLastPGFError();
-
-	#define ReturnWithError(err) { _PGF_Error_ = err; return; }
-	#define ReturnWithError2(err, ret) { _PGF_Error_ = err; return ret; }
-#else
-	#define ReturnWithError(err) throw IOException(err)
-	#define ReturnWithError2(err, ret) throw IOException(err)
-#endif //NEXCEPTIONS
-
-#define THROW_ throw(IOException)
-#define CONST const
-
-//-------------------------------------------------------------------------------
-// constants
-//-------------------------------------------------------------------------------
-#define FSFromStart			SEEK_SET
-#define FSFromCurrent		SEEK_CUR
-#define FSFromEnd			SEEK_END
-
-//-------------------------------------------------------------------------------
-// IO Error constants
-//-------------------------------------------------------------------------------
-#define NoError					0x0000			///< no error
-#define AppError				0x2000			///< all application error messages must be larger than this value
-#define InsufficientMemory		0x2001			///< memory allocation wasn't successfull
-#define InvalidStreamPos		0x2002			///< invalid memory stream position
-#define EscapePressed			0x2003			///< user break by ESC
-#define WrongVersion			0x2004			///< wrong pgf version 
-#define FormatCannotRead		0x2005			///< wrong data file format
-#define ImageTooSmall			0x2006			///< image is too small
-#define ZlibError				0x2007			///< error in zlib functions
-#define ColorTableError			0x2008			///< errors related to color table size
-#define PNGError				0x2009			///< errors in png functions
-#define MissingData				0x200A			///< expected data cannot be read
-
-//-------------------------------------------------------------------------------
-// methods
-//-------------------------------------------------------------------------------
-__inline OSError FileRead(HANDLE hFile, int *count, void *buffPtr) {
-	*count = (int)read(hFile, buffPtr, *count);
-	if (*count != -1) {
-		return NoError;
-	} else {
-		return errno;
-	}
-}
-
-__inline OSError FileWrite(HANDLE hFile, int *count, void *buffPtr) {
-	*count = (int)write(hFile, buffPtr, (size_t)*count);
-	if (*count != -1) {
-		return NoError;
-	} else {
-		return errno;
-	}
-}
-
-__inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
-	#ifdef __APPLE__
-		off_t ret;
-		if ((ret = lseek(hFile, 0, SEEK_CUR)) == -1) {
-			return errno;
-		} else {
-			*pos = (UINT64)ret;
-			return NoError;
-		}
-	#else
-		off64_t ret;
-		if ((ret = lseek64(hFile, 0, SEEK_CUR)) == -1) {
-			return errno;
-		} else {
-			*pos = (UINT64)ret;
-			return NoError;
-		}
-	#endif
-}
-
-__inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
-	#ifdef __APPLE__
-		if ((lseek(hFile, (off_t)posOff, posMode)) == -1) {
-			return errno;
-		} else {
-			return NoError;
-		}
-	#else
-		if ((lseek64(hFile, (off64_t)posOff, posMode)) == -1) {
-			return errno;
-		} else {
-			return NoError;
-		}
-	#endif
-}
-
-#endif /* __POSIX__ */
-//-------------------------------------------------------------------------------
-
-
-//-------------------------------------------------------------------------------
-//	Big Endian
-//-------------------------------------------------------------------------------
-#ifdef PGF_USE_BIG_ENDIAN 
-
-#ifndef _lrotl
-	#define _lrotl(x,n)	(((x) << ((UINT32)(n))) | ((x) >> (32 - (UINT32)(n))))
-#endif
-
-__inline UINT16 ByteSwap(UINT16 wX) {
-	return ((wX & 0xFF00) >> 8) | ((wX & 0x00FF) << 8);
-}
-
-__inline UINT32 ByteSwap(UINT32 dwX) { 
-#ifdef _X86_     
-	_asm mov eax, dwX     
-	_asm bswap eax
-	_asm mov dwX, eax      
-	return dwX; 
-#else     
-	return _lrotl(((dwX & 0xFF00FF00) >> 8) | ((dwX & 0x00FF00FF) << 8), 16); 
-#endif 
-}
-
-#if defined(WIN32) || defined(WIN64)
-__inline UINT64 ByteSwap(UINT64 ui64) { 
-	return _byteswap_uint64(ui64);
-}
-#endif
-
-#define __VAL(x) ByteSwap(x)
-
-#else //PGF_USE_BIG_ENDIAN
-
-	#define __VAL(x) (x)
-
-#endif //PGF_USE_BIG_ENDIAN
- 
-// OpenMP rules (inspired from libraw project)
-// NOTE: Use LIBPGF_DISABLE_OPENMP to disable OpenMP support in whole libpgf
-#define LIBPGF_DISABLE_OPENMP
-#undef LIBPGF_USE_OPENMP
-
-#ifndef LIBPGF_DISABLE_OPENMP
-# if defined (_OPENMP)
-#  if defined (WIN32) || defined(WIN64)
-#   if defined (_MSC_VER) && (_MSC_VER >= 1500)
-//   VS2008 SP1 and VS2010+ : OpenMP works OK
-#    define LIBPGF_USE_OPENMP
-#   elif defined (__INTEL_COMPILER) && (__INTEL_COMPILER >=910)
-//   untested on 9.x and 10.x, Intel documentation claims OpenMP 2.5 support in 9.1
-#    define LIBPGF_USE_OPENMP
-#   else
-#    undef LIBPGF_USE_OPENMP
-#   endif
-//  Not Win32
-#  elif (defined(__APPLE__) || defined(__MACOSX__)) && defined(_REENTRANT)
-#   undef LIBPGF_USE_OPENMP
-#  else
-#   define LIBPGF_USE_OPENMP
-#  endif
-# endif // defined (_OPENMP)
-#endif // ifndef LIBPGF_DISABLE_OPENMP
-#ifdef LIBPGF_USE_OPENMP
-#include <omp.h>
-#endif
-
-#endif //PGF_PGFPLATFORM_H
+/*
+ * The Progressive Graphics File; http://www.libpgf.org
+ * 
+ * $Date: 2007-06-12 19:27:47 +0200 (Di, 12 Jun 2007) $
+ * $Revision: 307 $
+ * 
+ * This file Copyright (C) 2006 xeraina GmbH, Switzerland
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU LESSER GENERAL PUBLIC LICENSE
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ * 
+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+//////////////////////////////////////////////////////////////////////
+/// @file PGFplatform.h
+/// @brief PGF platform specific definitions
+/// @author C. Stamm
+
+#ifndef PGF_PGFPLATFORM_H
+#define PGF_PGFPLATFORM_H
+
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+
+//-------------------------------------------------------------------------------
+// Endianess detection taken from lcms2 header.
+// This list can be endless, so only some checks are performed over here.
+//-------------------------------------------------------------------------------
+#if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(WORDS_BIGENDIAN)
+#define PGF_USE_BIG_ENDIAN 1
+#endif
+
+#if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(__sparc) || defined(__sparc__)
+#define PGF_USE_BIG_ENDIAN 1
+#endif
+
+#if defined(__ppc__) || defined(__s390__) || defined(__s390x__)
+#define PGF_USE_BIG_ENDIAN 1
+#endif
+
+#ifdef TARGET_CPU_PPC
+#define PGF_USE_BIG_ENDIAN 1
+#endif
+
+//-------------------------------------------------------------------------------
+// ROI support
+//-------------------------------------------------------------------------------
+#ifndef NPGFROI
+#define __PGFROISUPPORT__ // without ROI support the program code gets simpler and smaller
+#endif
+
+//-------------------------------------------------------------------------------
+// 32 bit per channel support
+//-------------------------------------------------------------------------------
+#ifndef NPGF32
+#define __PGF32SUPPORT__ // without 32 bit the memory consumption during encoding and decoding is much lesser
+#endif
+
+//-------------------------------------------------------------------------------
+//	32 Bit platform constants
+//-------------------------------------------------------------------------------
+#define WordWidth			32					///< WordBytes*8
+#define WordWidthLog		5					///< ld of WordWidth
+#define WordMask			0xFFFFFFE0			///< least WordWidthLog bits are zero
+#define WordBytes			4					///< sizeof(UINT32)
+#define WordBytesMask		0xFFFFFFFC			///< least WordBytesLog bits are zero
+#define WordBytesLog		2					///< ld of WordBytes
+
+//-------------------------------------------------------------------------------
+// Alignment macros (used in PGF based libraries)
+//-------------------------------------------------------------------------------
+#define DWWIDTHBITS(bits)	(((bits) + WordWidth - 1) & WordMask)		///< aligns scanline width in bits to DWORD value
+#define DWWIDTH(bytes)		(((bytes) + WordBytes - 1) & WordBytesMask)	///< aligns scanline width in bytes to DWORD value
+#define DWWIDTHREST(bytes)	((WordBytes - (bytes)%WordBytes)%WordBytes)	///< DWWIDTH(bytes) - bytes
+
+//-------------------------------------------------------------------------------
+// Min-Max macros
+//-------------------------------------------------------------------------------
+#ifndef __min
+	#define __min(x, y)		((x) <= (y) ? (x) : (y))
+	#define __max(x, y)		((x) >= (y) ? (x) : (y))
+#endif // __min
+
+//-------------------------------------------------------------------------------
+//	Defines -- Adobe image modes.
+//-------------------------------------------------------------------------------
+#define ImageModeBitmap				0
+#define ImageModeGrayScale			1
+#define ImageModeIndexedColor		2
+#define ImageModeRGBColor			3
+#define ImageModeCMYKColor			4
+#define ImageModeHSLColor			5
+#define ImageModeHSBColor			6
+#define ImageModeMultichannel		7
+#define ImageModeDuotone			8
+#define ImageModeLabColor			9
+#define ImageModeGray16				10		// 565
+#define ImageModeRGB48				11
+#define ImageModeLab48				12
+#define ImageModeCMYK64				13
+#define ImageModeDeepMultichannel	14
+#define ImageModeDuotone16			15
+// pgf extension
+#define ImageModeRGBA				17
+#define ImageModeGray32				18		// MSB is 0 (can be interpreted as signed 15.16 fixed point format)
+#define ImageModeRGB12				19
+#define ImageModeRGB16				20
+#define ImageModeUnknown			255
+
+
+//-------------------------------------------------------------------------------
+// WINDOWS 
+//-------------------------------------------------------------------------------
+#if defined(WIN32) || defined(WINCE) || defined(WIN64)
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+
+//-------------------------------------------------------------------------------
+// MFC
+//-------------------------------------------------------------------------------
+#ifdef _MFC_VER
+#ifndef _WIN32_WINNT            // Specifies that the minimum required platform is Windows Vista.
+#define _WIN32_WINNT 0x0600     // Change this to the appropriate value to target other versions of Windows.
+#endif
+#include <afx.h>
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>			// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+#else
+
+#include <windows.h>
+#include <ole2.h>
+
+#endif // _MFC_VER 
+//-------------------------------------------------------------------------------
+
+#define DllExport   __declspec( dllexport ) 
+
+//-------------------------------------------------------------------------------
+// unsigned number type definitions
+//-------------------------------------------------------------------------------
+typedef unsigned char		UINT8;
+typedef unsigned char		BYTE;
+typedef unsigned short		UINT16;
+typedef unsigned short      WORD;
+typedef	unsigned int		UINT32;
+typedef unsigned long       DWORD;
+typedef unsigned long       ULONG;
+typedef unsigned __int64	UINT64; 
+typedef unsigned __int64	ULONGLONG; 
+
+//-------------------------------------------------------------------------------
+// signed number type definitions
+//-------------------------------------------------------------------------------
+typedef signed char			INT8;
+typedef signed short		INT16;
+typedef signed int			INT32;
+typedef signed int			BOOL;
+typedef signed long			LONG;
+typedef signed __int64		INT64;
+typedef signed __int64		LONGLONG;
+
+//-------------------------------------------------------------------------------
+// other types
+//-------------------------------------------------------------------------------
+typedef int OSError;
+typedef bool (__cdecl *CallbackPtr)(double percent, bool escapeAllowed, void *data);
+
+//-------------------------------------------------------------------------------
+// struct type definitions
+//-------------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------------
+// DEBUG macros
+//-------------------------------------------------------------------------------
+#ifndef ASSERT
+	#ifdef _DEBUG
+		#define ASSERT(x)	assert(x)
+	#else
+		#if defined(__GNUC__) 
+			#define ASSERT(ignore)((void) 0) 
+		#elif _MSC_VER >= 1300 
+			#define ASSERT		__noop
+		#else
+			#define ASSERT ((void)0)
+		#endif
+	#endif //_DEBUG
+#endif //ASSERT
+
+//-------------------------------------------------------------------------------
+// Exception handling macros
+//-------------------------------------------------------------------------------
+#ifdef NEXCEPTIONS
+	extern OSError _PGF_Error_;
+	extern OSError GetLastPGFError();
+
+	#define ReturnWithError(err) { _PGF_Error_ = err; return; }
+	#define ReturnWithError2(err, ret) { _PGF_Error_ = err; return ret; }
+#else
+	#define ReturnWithError(err) throw IOException(err)
+	#define ReturnWithError2(err, ret) throw IOException(err)
+#endif //NEXCEPTIONS
+
+//-------------------------------------------------------------------------------
+// constants
+//-------------------------------------------------------------------------------
+#define FSFromStart		FILE_BEGIN				// 0
+#define FSFromCurrent	FILE_CURRENT			// 1
+#define FSFromEnd		FILE_END				// 2
+
+#define INVALID_SET_FILE_POINTER ((DWORD)-1)
+
+//-------------------------------------------------------------------------------
+// IO Error constants
+//-------------------------------------------------------------------------------
+#define NoError				ERROR_SUCCESS		///< no error
+#define AppError			0x20000000			///< all application error messages must be larger than this value
+#define InsufficientMemory	0x20000001			///< memory allocation was not successfull
+#define InvalidStreamPos	0x20000002			///< invalid memory stream position
+#define EscapePressed		0x20000003			///< user break by ESC
+#define WrongVersion		0x20000004			///< wrong PGF version 
+#define FormatCannotRead	0x20000005			///< wrong data file format
+#define ImageTooSmall		0x20000006			///< image is too small
+#define ZlibError			0x20000007			///< error in zlib functions
+#define ColorTableError		0x20000008			///< errors related to color table size
+#define PNGError			0x20000009			///< errors in png functions
+#define MissingData			0x2000000A			///< expected data cannot be read
+
+//-------------------------------------------------------------------------------
+// methods
+//-------------------------------------------------------------------------------
+inline OSError FileRead(HANDLE hFile, int *count, void *buffPtr) {
+	if (ReadFile(hFile, buffPtr, *count, (ULONG *)count, nullptr)) {
+		return NoError;
+	} else {
+		return GetLastError();
+	}
+}
+
+inline OSError FileWrite(HANDLE hFile, int *count, void *buffPtr) {
+	if (WriteFile(hFile, buffPtr, *count, (ULONG *)count, nullptr)) {
+		return NoError;
+	} else {
+		return GetLastError();
+	}
+}
+
+inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
+#ifdef WINCE
+	LARGE_INTEGER li;
+	li.QuadPart = 0;
+
+	li.LowPart = SetFilePointer (hFile, li.LowPart, &li.HighPart, FILE_CURRENT);
+	if (li.LowPart == INVALID_SET_FILE_POINTER) {
+		OSError err = GetLastError();
+		if (err != NoError) {
+			return err;
+		}
+	}
+	*pos = li.QuadPart;
+	return NoError;
+#else
+	LARGE_INTEGER li;
+	li.QuadPart = 0;
+	if (SetFilePointerEx(hFile, li, (PLARGE_INTEGER)pos, FILE_CURRENT)) {
+		return NoError;
+	} else {
+		return GetLastError();
+	}
+#endif
+}
+
+inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
+#ifdef WINCE
+	LARGE_INTEGER li;
+	li.QuadPart = posOff;
+
+	if (SetFilePointer (hFile, li.LowPart, &li.HighPart, posMode) == INVALID_SET_FILE_POINTER) {
+		OSError err = GetLastError();
+		if (err != NoError) {
+			return err;
+		}
+	}
+	return NoError;
+#else
+	LARGE_INTEGER li;
+	li.QuadPart = posOff;
+	if (SetFilePointerEx(hFile, li, nullptr, posMode)) {
+		return NoError;
+	} else {
+		return GetLastError();
+	}
+#endif
+}
+#endif //WIN32
+
+
+//-------------------------------------------------------------------------------
+// Apple OSX
+//-------------------------------------------------------------------------------
+#ifdef __APPLE__
+#define __POSIX__ 
+#endif // __APPLE__
+
+
+//-------------------------------------------------------------------------------
+// LINUX
+//-------------------------------------------------------------------------------
+#if defined(__linux__) || defined(__GLIBC__)
+#define __POSIX__
+#endif // __linux__ or __GLIBC__
+
+
+//-------------------------------------------------------------------------------
+// SOLARIS
+//-------------------------------------------------------------------------------
+#ifdef __sun
+#define __POSIX__
+#endif // __sun
+
+
+//-------------------------------------------------------------------------------
+// *BSD
+//-------------------------------------------------------------------------------
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#ifndef __POSIX__ 
+#define __POSIX__ 
+#endif 
+
+#ifndef off64_t 
+#define off64_t off_t 
+#endif 
+
+#ifndef lseek64 
+#define lseek64 lseek 
+#endif 
+
+#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__
+
+
+//-------------------------------------------------------------------------------
+// POSIX *NIXes
+//-------------------------------------------------------------------------------
+
+#ifdef __POSIX__
+#include <unistd.h>
+#include <errno.h>
+#include <stdint.h>		// for int64_t and uint64_t
+#include <string.h>		// memcpy()
+
+#undef major
+
+//-------------------------------------------------------------------------------
+// unsigned number type definitions
+//-------------------------------------------------------------------------------
+
+typedef unsigned char		UINT8;
+typedef unsigned char		BYTE;
+typedef unsigned short		UINT16;
+typedef unsigned short		WORD;
+typedef unsigned int		UINT32;
+typedef unsigned int		DWORD;
+typedef unsigned long		ULONG;
+typedef unsigned long long  __Uint64;
+typedef __Uint64			UINT64;
+typedef __Uint64			ULONGLONG;
+
+//-------------------------------------------------------------------------------
+// signed number type definitions
+//-------------------------------------------------------------------------------
+typedef signed char			INT8;
+typedef signed short		INT16;
+typedef signed int			INT32;
+typedef signed int			BOOL;
+typedef signed long			LONG;
+typedef int64_t				INT64;
+typedef int64_t				LONGLONG;
+
+//-------------------------------------------------------------------------------
+// other types
+//-------------------------------------------------------------------------------
+typedef int					OSError;
+typedef int					HANDLE;	
+typedef unsigned long		ULONG_PTR;
+typedef void*				PVOID;
+typedef char*				LPTSTR;
+typedef bool (*CallbackPtr)(double percent, bool escapeAllowed, void *data);
+
+//-------------------------------------------------------------------------------
+// struct type definitions
+//-------------------------------------------------------------------------------
+typedef struct tagRGBTRIPLE {
+	BYTE rgbtBlue;
+	BYTE rgbtGreen;
+	BYTE rgbtRed;
+} RGBTRIPLE;
+
+typedef struct tagRGBQUAD {
+	BYTE rgbBlue;
+	BYTE rgbGreen;
+	BYTE rgbRed;
+	BYTE rgbReserved;
+} RGBQUAD;
+
+typedef union _LARGE_INTEGER {
+  struct {
+    DWORD LowPart;
+    LONG HighPart;
+  } u;
+  LONGLONG QuadPart;
+} LARGE_INTEGER, *PLARGE_INTEGER;
+#endif // __POSIX__
+
+
+#if defined(__POSIX__) || defined(WINCE)
+// CMYK macros
+#define GetKValue(cmyk)      ((BYTE)(cmyk))
+#define GetYValue(cmyk)      ((BYTE)((cmyk)>> 8))
+#define GetMValue(cmyk)      ((BYTE)((cmyk)>>16))
+#define GetCValue(cmyk)      ((BYTE)((cmyk)>>24))
+#define CMYK(c,m,y,k)		 ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
+
+//-------------------------------------------------------------------------------
+// methods
+//-------------------------------------------------------------------------------
+/* The MulDiv function multiplies two 32-bit values and then divides the 64-bit 
+ * result by a third 32-bit value. The return value is rounded up or down to 
+ * the nearest integer.
+ * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winprog/winprog/muldiv.asp
+ * */
+__inline int MulDiv(int nNumber, int nNumerator, int nDenominator) {
+	INT64 multRes = nNumber*nNumerator;
+	INT32 divRes = INT32(multRes/nDenominator);
+	return divRes;
+}
+#endif // __POSIX__ or WINCE
+
+
+#ifdef __POSIX__
+//-------------------------------------------------------------------------------
+// DEBUG macros
+//-------------------------------------------------------------------------------
+#ifndef ASSERT
+	#ifdef _DEBUG
+		#define ASSERT(x)	assert(x)
+	#else
+		#define ASSERT(x)	
+	#endif //_DEBUG
+#endif //ASSERT
+
+//-------------------------------------------------------------------------------
+// Exception handling macros
+//-------------------------------------------------------------------------------
+#ifdef NEXCEPTIONS
+	extern OSError _PGF_Error_;
+	extern OSError GetLastPGFError();
+
+	#define ReturnWithError(err) { _PGF_Error_ = err; return; }
+	#define ReturnWithError2(err, ret) { _PGF_Error_ = err; return ret; }
+#else
+	#define ReturnWithError(err) throw IOException(err)
+	#define ReturnWithError2(err, ret) throw IOException(err)
+#endif //NEXCEPTIONS
+
+#define THROW_ throw(IOException)
+#define CONST const
+
+//-------------------------------------------------------------------------------
+// constants
+//-------------------------------------------------------------------------------
+#define FSFromStart			SEEK_SET
+#define FSFromCurrent		SEEK_CUR
+#define FSFromEnd			SEEK_END
+#define nullptr				NULL
+
+//-------------------------------------------------------------------------------
+// IO Error constants
+//-------------------------------------------------------------------------------
+#define NoError					0x0000			///< no error
+#define AppError				0x2000			///< all application error messages must be larger than this value
+#define InsufficientMemory		0x2001			///< memory allocation wasn't successfull
+#define InvalidStreamPos		0x2002			///< invalid memory stream position
+#define EscapePressed			0x2003			///< user break by ESC
+#define WrongVersion			0x2004			///< wrong pgf version 
+#define FormatCannotRead		0x2005			///< wrong data file format
+#define ImageTooSmall			0x2006			///< image is too small
+#define ZlibError				0x2007			///< error in zlib functions
+#define ColorTableError			0x2008			///< errors related to color table size
+#define PNGError				0x2009			///< errors in png functions
+#define MissingData				0x200A			///< expected data cannot be read
+
+//-------------------------------------------------------------------------------
+// methods
+//-------------------------------------------------------------------------------
+__inline OSError FileRead(HANDLE hFile, int *count, void *buffPtr) {
+	*count = (int)read(hFile, buffPtr, *count);
+	if (*count != -1) {
+		return NoError;
+	} else {
+		return errno;
+	}
+}
+
+__inline OSError FileWrite(HANDLE hFile, int *count, void *buffPtr) {
+	*count = (int)write(hFile, buffPtr, (size_t)*count);
+	if (*count != -1) {
+		return NoError;
+	} else {
+		return errno;
+	}
+}
+
+__inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
+	#ifdef __APPLE__
+		off_t ret;
+		if ((ret = lseek(hFile, 0, SEEK_CUR)) == -1) {
+			return errno;
+		} else {
+			*pos = (UINT64)ret;
+			return NoError;
+		}
+	#else
+		off64_t ret;
+		if ((ret = lseek64(hFile, 0, SEEK_CUR)) == -1) {
+			return errno;
+		} else {
+			*pos = (UINT64)ret;
+			return NoError;
+		}
+	#endif
+}
+
+__inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
+	#ifdef __APPLE__
+		if ((lseek(hFile, (off_t)posOff, posMode)) == -1) {
+			return errno;
+		} else {
+			return NoError;
+		}
+	#else
+		if ((lseek64(hFile, (off64_t)posOff, posMode)) == -1) {
+			return errno;
+		} else {
+			return NoError;
+		}
+	#endif
+}
+
+#endif /* __POSIX__ */
+//-------------------------------------------------------------------------------
+
+
+//-------------------------------------------------------------------------------
+//	Big Endian
+//-------------------------------------------------------------------------------
+#ifdef PGF_USE_BIG_ENDIAN 
+
+#ifndef _lrotl
+	#define _lrotl(x,n)	(((x) << ((UINT32)(n))) | ((x) >> (32 - (UINT32)(n))))
+#endif
+
+__inline UINT16 ByteSwap(UINT16 wX) {
+	return ((wX & 0xFF00) >> 8) | ((wX & 0x00FF) << 8);
+}
+
+__inline UINT32 ByteSwap(UINT32 dwX) { 
+#ifdef _X86_     
+	_asm mov eax, dwX     
+	_asm bswap eax
+	_asm mov dwX, eax      
+	return dwX; 
+#else     
+	return _lrotl(((dwX & 0xFF00FF00) >> 8) | ((dwX & 0x00FF00FF) << 8), 16); 
+#endif 
+}
+
+#if defined(WIN32) || defined(WIN64)
+__inline UINT64 ByteSwap(UINT64 ui64) { 
+	return _byteswap_uint64(ui64);
+}
+#endif
+
+#define __VAL(x) ByteSwap(x)
+
+#else //PGF_USE_BIG_ENDIAN
+
+	#define __VAL(x) (x)
+
+#endif //PGF_USE_BIG_ENDIAN
+ 
+// OpenMP rules (inspired from libraw project)
+// NOTE: Use LIBPGF_DISABLE_OPENMP to disable OpenMP support in whole libpgf
+#ifndef LIBPGF_DISABLE_OPENMP
+# if defined (_OPENMP)
+#  if defined (WIN32) || defined(WIN64)
+#   if defined (_MSC_VER) && (_MSC_VER >= 1500)
+//   VS2008 SP1 and VS2010+ : OpenMP works OK
+#    define LIBPGF_USE_OPENMP
+#   elif defined (__INTEL_COMPILER) && (__INTEL_COMPILER >=910)
+//   untested on 9.x and 10.x, Intel documentation claims OpenMP 2.5 support in 9.1
+#    define LIBPGF_USE_OPENMP
+#   else
+#    undef LIBPGF_USE_OPENMP
+#   endif
+//  Not Win32
+#  elif (defined(__APPLE__) || defined(__MACOSX__)) && defined(_REENTRANT)
+#   undef LIBPGF_USE_OPENMP
+#  else
+#   define LIBPGF_USE_OPENMP
+#  endif
+# endif // defined (_OPENMP)
+#endif // ifndef LIBPGF_DISABLE_OPENMP
+#ifdef LIBPGF_USE_OPENMP
+#include <omp.h>
+#endif
+
+#endif //PGF_PGFPLATFORM_H
diff --git a/scribus/third_party/pgf/PGFstream.cpp b/scribus/third_party/pgf/PGFstream.cpp
index 1144941f5b134e299e5b7e2bfb907b43181edd40..35f1616a3395e01c432792f8dda2561e87672144 100644
--- a/scribus/third_party/pgf/PGFstream.cpp
+++ b/scribus/third_party/pgf/PGFstream.cpp
@@ -35,7 +35,7 @@
 //////////////////////////////////////////////////////////////////////
 // CPGFFileStream
 //////////////////////////////////////////////////////////////////////
-void CPGFFileStream::Write(int *count, void *buffPtr) THROW_ {
+void CPGFFileStream::Write(int *count, void *buffPtr) {
 	ASSERT(count);
 	ASSERT(buffPtr);
 	ASSERT(IsValid());
@@ -45,7 +45,7 @@ void CPGFFileStream::Write(int *count, void *buffPtr) THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFFileStream::Read(int *count, void *buffPtr) THROW_ {
+void CPGFFileStream::Read(int *count, void *buffPtr) {
 	ASSERT(count);
 	ASSERT(buffPtr);
 	ASSERT(IsValid());
@@ -54,14 +54,14 @@ void CPGFFileStream::Read(int *count, void *buffPtr) THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFFileStream::SetPos(short posMode, INT64 posOff) THROW_ {
+void CPGFFileStream::SetPos(short posMode, INT64 posOff) {
 	ASSERT(IsValid());
 	OSError err;
 	if ((err = SetFPos(m_hFile, posMode, posOff)) != NoError) ReturnWithError(err);
 }
 
 //////////////////////////////////////////////////////////////////////
-UINT64 CPGFFileStream::GetPos() const THROW_ {
+UINT64 CPGFFileStream::GetPos() const {
 	ASSERT(IsValid());
 	OSError err;
 	UINT64 pos = 0;
@@ -75,7 +75,7 @@ UINT64 CPGFFileStream::GetPos() const THROW_ {
 //////////////////////////////////////////////////////////////////////
 /// Allocate memory block of given size
 /// @param size Memory size
-CPGFMemoryStream::CPGFMemoryStream(size_t size) THROW_ 
+CPGFMemoryStream::CPGFMemoryStream(size_t size) 
 : m_size(size)
 , m_allocated(true) {
 	m_buffer = m_pos = m_eos = new(std::nothrow) UINT8[m_size];
@@ -86,7 +86,7 @@ CPGFMemoryStream::CPGFMemoryStream(size_t size) THROW_
 /// Use already allocated memory of given size
 /// @param pBuffer Memory location
 /// @param size Memory size
-CPGFMemoryStream::CPGFMemoryStream(UINT8 *pBuffer, size_t size) THROW_ 
+CPGFMemoryStream::CPGFMemoryStream(UINT8 *pBuffer, size_t size) 
 : m_buffer(pBuffer)
 , m_pos(pBuffer)
 , m_eos(pBuffer + size)
@@ -99,7 +99,7 @@ CPGFMemoryStream::CPGFMemoryStream(UINT8 *pBuffer, size_t size) THROW_
 /// Use already allocated memory of given size
 /// @param pBuffer Memory location
 /// @param size Memory size
-void CPGFMemoryStream::Reinitialize(UINT8 *pBuffer, size_t size) THROW_ {
+void CPGFMemoryStream::Reinitialize(UINT8 *pBuffer, size_t size) {
 	if (!m_allocated) {
 		m_buffer = m_pos = pBuffer;
 		m_size = size;
@@ -108,7 +108,7 @@ void CPGFMemoryStream::Reinitialize(UINT8 *pBuffer, size_t size) THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFMemoryStream::Write(int *count, void *buffPtr) THROW_ {
+void CPGFMemoryStream::Write(int *count, void *buffPtr) {
 	ASSERT(count);
 	ASSERT(buffPtr);
 	ASSERT(IsValid());
@@ -165,7 +165,7 @@ void CPGFMemoryStream::Read(int *count, void *buffPtr) {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFMemoryStream::SetPos(short posMode, INT64 posOff) THROW_ {
+void CPGFMemoryStream::SetPos(short posMode, INT64 posOff) {
 	ASSERT(IsValid());
 	switch(posMode) {
 	case FSFromStart:
@@ -189,7 +189,7 @@ void CPGFMemoryStream::SetPos(short posMode, INT64 posOff) THROW_ {
 // CPGFMemFileStream
 #ifdef _MFC_VER
 //////////////////////////////////////////////////////////////////////
-void CPGFMemFileStream::Write(int *count, void *buffPtr) THROW_ {
+void CPGFMemFileStream::Write(int *count, void *buffPtr) {
 	ASSERT(count);
 	ASSERT(buffPtr);
 	ASSERT(IsValid());
@@ -197,7 +197,7 @@ void CPGFMemFileStream::Write(int *count, void *buffPtr) THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFMemFileStream::Read(int *count, void *buffPtr) THROW_ {
+void CPGFMemFileStream::Read(int *count, void *buffPtr) {
 	ASSERT(count);
 	ASSERT(buffPtr);
 	ASSERT(IsValid());
@@ -205,13 +205,13 @@ void CPGFMemFileStream::Read(int *count, void *buffPtr) THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFMemFileStream::SetPos(short posMode, INT64 posOff) THROW_ {
+void CPGFMemFileStream::SetPos(short posMode, INT64 posOff) {
 	ASSERT(IsValid());
 	m_memFile->Seek(posOff, posMode); 
 }
 
 //////////////////////////////////////////////////////////////////////
-UINT64 CPGFMemFileStream::GetPos() const THROW_ {
+UINT64 CPGFMemFileStream::GetPos() const {
 	return (UINT64)m_memFile->GetPosition();
 }
 #endif // _MFC_VER
@@ -220,7 +220,7 @@ UINT64 CPGFMemFileStream::GetPos() const THROW_ {
 // CPGFIStream
 #if defined(WIN32) || defined(WINCE)
 //////////////////////////////////////////////////////////////////////
-void CPGFIStream::Write(int *count, void *buffPtr) THROW_ {
+void CPGFIStream::Write(int *count, void *buffPtr) {
 	ASSERT(count);
 	ASSERT(buffPtr);
 	ASSERT(IsValid());
@@ -232,7 +232,7 @@ void CPGFIStream::Write(int *count, void *buffPtr) THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFIStream::Read(int *count, void *buffPtr) THROW_ {
+void CPGFIStream::Read(int *count, void *buffPtr) {
 	ASSERT(count);
 	ASSERT(buffPtr);
 	ASSERT(IsValid());
@@ -244,20 +244,20 @@ void CPGFIStream::Read(int *count, void *buffPtr) THROW_ {
 }
 
 //////////////////////////////////////////////////////////////////////
-void CPGFIStream::SetPos(short posMode, INT64 posOff) THROW_ {
+void CPGFIStream::SetPos(short posMode, INT64 posOff) {
 	ASSERT(IsValid());
 	
 	LARGE_INTEGER li;
 	li.QuadPart = posOff;
 
-	HRESULT hr = m_stream->Seek(li, posMode, NULL); 
+	HRESULT hr = m_stream->Seek(li, posMode, nullptr); 
 	if (FAILED(hr)) {
 		ReturnWithError(hr);
 	}
 }
 
 //////////////////////////////////////////////////////////////////////
-UINT64 CPGFIStream::GetPos() const THROW_ {
+UINT64 CPGFIStream::GetPos() const {
 	ASSERT(IsValid());
 	
 	LARGE_INTEGER n;
diff --git a/scribus/third_party/pgf/PGFstream.h b/scribus/third_party/pgf/PGFstream.h
index 1bd4d131608a9cd734e138bdd4ba9a1f049dd8e7..91af55dcd96dd1e45702acd0305528931d58aba1 100644
--- a/scribus/third_party/pgf/PGFstream.h
+++ b/scribus/third_party/pgf/PGFstream.h
@@ -92,10 +92,10 @@ public:
 	HANDLE GetHandle() { return m_hFile; }
 
 	virtual ~CPGFFileStream() { m_hFile = 0; }
-	virtual void Write(int *count, void *buffer) THROW_; // throws IOException 
-	virtual void Read(int *count, void *buffer) THROW_; // throws IOException 
-	virtual void SetPos(short posMode, INT64 posOff) THROW_; // throws IOException
-	virtual UINT64 GetPos() const THROW_; // throws IOException
+	virtual void Write(int *count, void *buffer); // throws IOException 
+	virtual void Read(int *count, void *buffer); // throws IOException 
+	virtual void SetPos(short posMode, INT64 posOff); // throws IOException
+	virtual UINT64 GetPos() const; // throws IOException
 	virtual bool   IsValid() const	{ return m_hFile != 0; }
 };
 
@@ -113,17 +113,17 @@ protected:
 public:
 	/// Constructor
 	/// @param size Size of new allocated memory buffer
-	CPGFMemoryStream(size_t size) THROW_;
+	CPGFMemoryStream(size_t size);
 	
 	/// Constructor. Use already allocated memory of given size
 	/// @param pBuffer Memory location
 	/// @param size Memory size
-	CPGFMemoryStream(UINT8 *pBuffer, size_t size) THROW_;
+	CPGFMemoryStream(UINT8 *pBuffer, size_t size);
 	
 	/// Use already allocated memory of given size
 	/// @param pBuffer Memory location
 	/// @param size Memory size
-	void Reinitialize(UINT8 *pBuffer, size_t size) THROW_;
+	void Reinitialize(UINT8 *pBuffer, size_t size);
 	
 	virtual ~CPGFMemoryStream() { 
 		m_pos = 0; 
@@ -133,9 +133,9 @@ public:
 		}
 	}
 
-	virtual void Write(int *count, void *buffer) THROW_; // throws IOException 
+	virtual void Write(int *count, void *buffer); // throws IOException 
 	virtual void Read(int *count, void *buffer);
-	virtual void SetPos(short posMode, INT64 posOff) THROW_; // throws IOException
+	virtual void SetPos(short posMode, INT64 posOff); // throws IOException
 	virtual UINT64 GetPos() const { ASSERT(IsValid()); return m_pos - m_buffer; }
 	virtual bool   IsValid() const	{ return m_buffer != 0; }
 
@@ -161,12 +161,12 @@ protected:
 	CMemFile *m_memFile;	///< MFC memory file
 public:
 	CPGFMemFileStream(CMemFile *memFile) : m_memFile(memFile) {}
-	virtual bool	IsValid() const	{ return m_memFile != NULL; }
+	virtual bool	IsValid() const	{ return m_memFile != nullptr; }
 	virtual ~CPGFMemFileStream() {}
-	virtual void Write(int *count, void *buffer) THROW_; // throws IOException 
-	virtual void Read(int *count, void *buffer) THROW_; // throws IOException 
-	virtual void SetPos(short posMode, INT64 posOff) THROW_; // throws IOException
-	virtual UINT64 GetPos() const THROW_; // throws IOException
+	virtual void Write(int *count, void *buffer); // throws IOException 
+	virtual void Read(int *count, void *buffer); // throws IOException 
+	virtual void SetPos(short posMode, INT64 posOff); // throws IOException
+	virtual UINT64 GetPos() const; // throws IOException
 };
 #endif
 
@@ -179,14 +179,14 @@ class CPGFIStream : public CPGFStream {
 protected:
 	IStream *m_stream;	///< COM+ IStream
 public:
-	CPGFIStream(IStream *stream) : m_stream(stream) {}
+	CPGFIStream(IStream *stream) : m_stream(stream) { m_stream->AddRef(); }
 	virtual bool IsValid() const	{ return m_stream != 0; }
-	virtual ~CPGFIStream() {}
-	virtual void Write(int *count, void *buffer) THROW_; // throws IOException 
-	virtual void Read(int *count, void *buffer) THROW_; // throws IOException 
-	virtual void SetPos(short posMode, INT64 posOff) THROW_; // throws IOException
-	virtual UINT64 GetPos() const THROW_; // throws IOException
-	IStream* GetIStream() const		{ return m_stream; }
+	virtual ~CPGFIStream() { m_stream->Release(); }
+	virtual void Write(int *count, void *buffer); // throws IOException 
+	virtual void Read(int *count, void *buffer); // throws IOException 
+	virtual void SetPos(short posMode, INT64 posOff); // throws IOException
+	virtual UINT64 GetPos() const; // throws IOException
+	IStream* GetIStream() const { return m_stream; }
 };
 #endif
 
diff --git a/scribus/third_party/pgf/PGFtypes.h b/scribus/third_party/pgf/PGFtypes.h
index 2fefc956ebc88d1e43bbd8fa0ab24761dd178cc2..3608057163d0b4ceacf85a00526a41c696e2da54 100644
--- a/scribus/third_party/pgf/PGFtypes.h
+++ b/scribus/third_party/pgf/PGFtypes.h
@@ -31,11 +31,6 @@
 
 #include "PGFplatform.h"
 
-//-------------------------------------------------------------------------------
-//	Constraints
-//-------------------------------------------------------------------------------
-// BufferSize <= UINT16_MAX
-
 //-------------------------------------------------------------------------------
 //	Codec versions
 //
@@ -43,11 +38,22 @@
 // Version 4:	DataT: INT32 instead of INT16, allows 31 bit per pixel and channel (backward compatibility assured)
 // Version 5:	ROI, new block-reordering scheme (backward compatibility assured)
 // Version 6:	modified data structure PGFPreHeader: hSize (header size) is now a UINT32 instead of a UINT16 (backward compatibility assured)
+// Version 7:	last two bytes in header are now used for extended version numbers; new data representation for bitmaps (backward compatibility assured)
 //
 //-------------------------------------------------------------------------------
-#define PGFCodecVersion		"6.14.12"			///< Major number
-												///< Minor number: Year (2) Week (2)
-#define PGFCodecVersionID   0x061412			///< Codec version ID to use for API check in client implementation
+#define PGFMajorNumber		7
+#define PGFYear				19
+#define	PGFWeek				3
+
+#define PPCAT_NX(A, B) A ## B
+#define PPCAT(A, B) PPCAT_NX(A, B)
+#define STRINGIZE_NX(A) #A
+#define STRINGIZE(A) STRINGIZE_NX(A)
+
+//#define PGFCodecVersionID		0x071822
+#define PGFCodecVersionID PPCAT(PPCAT(PPCAT(0x0, PGFMajorNumber), PGFYear), PGFWeek)
+//#define PGFCodecVersion		"7.19.3"			///< Major number, Minor number: Year (2) Week (2)
+#define PGFCodecVersion STRINGIZE(PPCAT(PPCAT(PPCAT(PPCAT(PGFMajorNumber, .), PGFYear), .), PGFWeek))
 
 //-------------------------------------------------------------------------------
 //	Image constants
@@ -63,18 +69,19 @@
 #define PGF32				4					///< 32 bit values are used -> allows at maximum 31 bits, otherwise 16 bit values are used -> allows at maximum 15 bits
 #define PGFROI				8					///< supports Regions Of Interest
 #define Version5			16					///< new coding scheme since major version 5
-#define Version6			32					///< new HeaderSize: 32 bits instead of 16 bits 
+#define Version6			32					///< hSize in PGFPreHeader uses 32 bits instead of 16 bits 
+#define Version7			64					///< Codec major and minor version number stored in PGFHeader
 // version numbers
 #ifdef __PGF32SUPPORT__
-#define PGFVersion			(Version2 | PGF32 | Version5 | Version6)	///< current standard version
+#define PGFVersion			(Version2 | PGF32 | Version5 | Version6 | Version7)	///< current standard version
 #else
-#define PGFVersion			(Version2 |         Version5 | Version6)	///< current standard version
+#define PGFVersion			(Version2 |         Version5 | Version6 | Version7)	///< current standard version
 #endif
 
 //-------------------------------------------------------------------------------
 //	Coder constants
 //-------------------------------------------------------------------------------
-#define BufferSize			16384				///< must be a multiple of WordWidth
+#define BufferSize			16384				///< must be a multiple of WordWidth, BufferSize <= UINT16_MAX
 #define RLblockSizeLen		15					///< block size length (< 16): ld(BufferSize) < RLblockSizeLen <= 2*ld(BufferSize)
 #define LinBlockSize		8					///< side length of a coefficient block in a HH or LL subband
 #define InterBlockSize		4					///< side length of a coefficient block in a HL or LH subband
@@ -89,10 +96,12 @@
 //-------------------------------------------------------------------------------
 // Types
 //-------------------------------------------------------------------------------
-enum Orientation { LL=0, HL=1, LH=2, HH=3 };
+enum Orientation		{ LL = 0, HL = 1, LH = 2, HH = 3 };
+enum ProgressMode		{ PM_Relative, PM_Absolute };
+enum UserdataPolicy		{ UP_Skip = 0, UP_CachePrefix = 1, UP_CacheAll = 2 };
 
 /// general PGF file structure
-/// PGFPreHeaderV6 PGFHeader PGFPostHeader LevelLengths Level_n-1 Level_n-2 ... Level_0
+/// PGFPreHeader PGFHeader [PGFPostHeader] LevelLengths Level_n-1 Level_n-2 ... Level_0
 /// PGFPostHeader ::= [ColorTable] [UserData]
 /// LevelLengths  ::= UINT32[nLevels]
 
@@ -112,25 +121,43 @@ struct PGFMagicVersion {
 /// @author C. Stamm
 /// @brief PGF pre-header
 struct PGFPreHeader : PGFMagicVersion {
-	UINT32 hSize;				///< total size of PGFHeader, [ColorTable], and [UserData] in bytes
+	UINT32 hSize;				///< total size of PGFHeader, [ColorTable], and [UserData] in bytes (since Version 6: 4 Bytes)
 	// total: 8 Bytes
 };
 
+/////////////////////////////////////////////////////////////////////
+/// Version number since major version 7
+/// @author C. Stamm
+/// @brief version number stored in header since major version 7 
+struct PGFVersionNumber {
+	PGFVersionNumber(UINT8 _major, UINT8 _year, UINT8 _week) : major(_major), year(_year), week(_week) {}
+
+#ifdef PGF_USE_BIG_ENDIAN
+	UINT16 week  : 6;	///< week number in a year
+	UINT16 year  : 6;	///< year since 2000 (year 2001 = 1)
+	UINT16 major : 4;	///< major version number
+#else
+	UINT16 major : 4;	///< major version number
+	UINT16 year  : 6;	///< year since 2000 (year 2001 = 1)
+	UINT16 week  : 6;	///< week number in a year
+#endif // PGF_USE_BIG_ENDIAN
+};
+
 /////////////////////////////////////////////////////////////////////
 /// PGF header contains image information
 /// @author C. Stamm
 /// @brief PGF header
 struct PGFHeader {
-	PGFHeader() : width(0), height(0), nLevels(0), quality(0), bpp(0), channels(0), mode(ImageModeUnknown), usedBitsPerChannel(0), reserved1(0), reserved2(0) {}
+	PGFHeader() : width(0), height(0), nLevels(0), quality(0), bpp(0), channels(0), mode(ImageModeUnknown), usedBitsPerChannel(0), version(0, 0, 0) {}
 	UINT32 width;				///< image width in pixels
 	UINT32 height;				///< image height in pixels
-	UINT8 nLevels;				///< number of DWT levels
+	UINT8 nLevels;				///< number of FWT transforms
 	UINT8 quality;				///< quantization parameter: 0=lossless, 4=standard, 6=poor quality
 	UINT8 bpp;					///< bits per pixel
 	UINT8 channels;				///< number of channels
 	UINT8 mode;					///< image mode according to Adobe's image modes
 	UINT8 usedBitsPerChannel;	///< number of used bits per channel in 16- and 32-bit per channel modes
-	UINT8 reserved1, reserved2;	///< not used
+	PGFVersionNumber version;	///< codec version number: (since Version 7)
 	// total: 16 Bytes
 };
 
@@ -139,9 +166,10 @@ struct PGFHeader {
 /// @author C. Stamm
 /// @brief Optional PGF post-header
 struct PGFPostHeader {
-	RGBQUAD clut[ColorTableLen];///< color table for indexed color images
-	UINT8 *userData;			///< user data of size userDataLen
-	UINT32 userDataLen;			///< user data size in bytes
+	RGBQUAD clut[ColorTableLen];///< color table for indexed color images (optional part of file header)
+	UINT8 *userData;			///< user data of size userDataLen (optional part of file header)
+	UINT32 userDataLen;			///< user data size in bytes (not part of file header)
+	UINT32 cachedUserDataLen;	///< cached user data size in bytes (not part of file header)
 };
 
 /////////////////////////////////////////////////////////////////////
@@ -149,14 +177,6 @@ struct PGFPostHeader {
 /// @author C. Stamm
 /// @brief Block header used with ROI coding scheme 
 union ROIBlockHeader {
-	/// Constructor
-	/// @param v Buffer size
-	ROIBlockHeader(UINT16 v) { val = v; }
-	/// Constructor
-	/// @param size Buffer size
-	/// @param end 0/1 Flag; 1: last part of a tile
-	ROIBlockHeader(UINT32 size, bool end)	{ ASSERT(size < (1 << RLblockSizeLen)); rbh.bufferSize = size; rbh.tileEnd = end; }
-	
 	UINT16 val; ///< unstructured union value
 	/// @brief Named ROI block header (part of the union)
 	struct RBH {
@@ -169,6 +189,15 @@ union ROIBlockHeader {
 #endif // PGF_USE_BIG_ENDIAN
 	} rbh;	///< ROI block header
 	// total: 2 Bytes
+
+	/// Constructor
+	/// @param v Buffer size
+	ROIBlockHeader(UINT16 v) { val = v; }
+
+	/// Constructor
+	/// @param size Buffer size
+	/// @param end 0/1 Flag; 1: last part of a tile
+	ROIBlockHeader(UINT32 size, bool end) { ASSERT(size < (1 << RLblockSizeLen)); rbh.bufferSize = size; rbh.tileEnd = end; }
 };
 
 #pragma pack()
@@ -178,13 +207,14 @@ union ROIBlockHeader {
 /// @author C. Stamm
 /// @brief PGF exception
 struct IOException {
+	OSError error;				///< operating system error code
+	
 	/// Standard constructor
 	IOException() : error(NoError) {}
+	
 	/// Constructor
 	/// @param err Run-time error
 	IOException(OSError err) : error(err) {}
-
-	OSError error;				///< operating system error code
 };
 
 /////////////////////////////////////////////////////////////////////
@@ -192,8 +222,11 @@ struct IOException {
 /// @author C. Stamm
 /// @brief Rectangle
 struct PGFRect {
+	UINT32 left, top, right, bottom;
+
 	/// Standard constructor
 	PGFRect() : left(0), top(0), right(0), bottom(0) {}
+	
 	/// Constructor
 	/// @param x Left offset
 	/// @param y Top offset
@@ -201,18 +234,34 @@ struct PGFRect {
 	/// @param height Rectangle height
 	PGFRect(UINT32 x, UINT32 y, UINT32 width, UINT32 height) : left(x), top(y), right(x + width), bottom(y + height) {}
 
+#ifdef WIN32
+	PGFRect(const RECT& rect) : left(rect.left), top(rect.top), right(rect.right), bottom(rect.bottom) {
+		ASSERT(rect.left >= 0 && rect.right >= 0 && rect.left <= rect.right);
+		ASSERT(rect.top >= 0 && rect.bottom >= 0 && rect.top <= rect.bottom);
+	}
+	
+	PGFRect& operator=(const RECT& rect) {
+		left = rect.left; top = rect.top; right = rect.right; bottom = rect.bottom;
+		return *this;
+	}
+	
+	operator RECT() {
+		RECT rect = { (LONG)left, (LONG)top, (LONG)right, (LONG)bottom };
+		return rect;
+	}
+#endif
+
 	/// @return Rectangle width
 	UINT32 Width() const					{ return right - left; }
+	
 	/// @return Rectangle height
 	UINT32 Height() const					{ return bottom - top; }
 	
-	/// Test if point (x,y) is inside this rectangle
+	/// Test if point (x,y) is inside this rectangle (inclusive top-left edges, exclusive bottom-right edges)
 	/// @param x Point coordinate x
 	/// @param y Point coordinate y
-	/// @return True if point (x,y) is inside this rectangle
+	/// @return True if point (x,y) is inside this rectangle (inclusive top-left edges, exclusive bottom-right edges)
 	bool IsInside(UINT32 x, UINT32 y) const { return (x >= left && x < right && y >= top && y < bottom); }
-
-	UINT32 left, top, right, bottom;
 };
 
 #ifdef __PGF32SUPPORT__
@@ -229,7 +278,8 @@ typedef void (*RefreshCB)(void *p);
 #define MagicVersionSize	sizeof(PGFMagicVersion)
 #define PreHeaderSize		sizeof(PGFPreHeader)
 #define HeaderSize			sizeof(PGFHeader)
-#define ColorTableSize		ColorTableLen*sizeof(RGBQUAD)
+#define ColorTableSize		(ColorTableLen*sizeof(RGBQUAD))
 #define DataTSize			sizeof(DataT)
+#define MaxUserDataSize		0x7FFFFFFF
 
 #endif //PGF_PGFTYPES_H
diff --git a/scribus/third_party/pgf/README b/scribus/third_party/pgf/README
new file mode 100644
index 0000000000000000000000000000000000000000..17c8b7c8aa98b2626e26781b274c5f1175fd4c13
--- /dev/null
+++ b/scribus/third_party/pgf/README
@@ -0,0 +1,142 @@
+The Progressive Graphics File
+=============================
+ 
+For more information see http://www.libpgf.org. There you can find some
+documents concerning this progressive graphic file codec.
+ 
+This project is hosted on the Sourceforge.net platform. For support and
+questions, please use the installed mailing list and forums there. 
+The Sourceforge URL of our project is: http://sourceforge.net/projects/libpgf
+
+=============================
+Scribus Integration
+
+- Backup the old thirdparty/pgf directory.
+
+- Delete the files:
+
+  - AUTHORS
+  - autogen.sh
+  - config.h.in
+  - configure.ac
+  - doc
+  - INSTALL
+  - libpgf.pc.in
+  - libpgf.spec.in
+  - Makefile.am
+  - NEWS
+  - PGFCodec.vcxproj
+  - PGFCodec.vcxproj.filters
+  - PGFCodec.vcxproj.user
+
+- Move the .h and .cpp files from src/ into the main directory and delete the reset.
+
+- Move the .h files in include/ into the main directory and delete  the rest.
+
+- Copy the old CMakeLists.txt into the new directory
+
+ 
+=============================
+Release Notes
+
+Version 7.19.3, (Tue, 15 Jan 2019)
+------------------------------------
+
+1. The new version is a minor update of version 7.15.25.
+
+2. This version fixes a compilation bug seen when ROI support is disabled.
+
+
+Version 7.15.32, (Thu, 6 Aug 2015)
+------------------------------------
+
+1. The new version is a minor update of version 7.15.25.
+
+2. This version improves the reuse of CPGFImage objects for several decoding operations. 
+   It clarifies the usage of CPGFImage::Close() and CPGFImage::Destroy() by deletion of 
+   Close(). Several reading operations can be performed in the following way:
+   Open(), Read(), GetBitmap(), ResetStreamPos(), Read(), GetBitmap(), ResetStreamPos(), ...
+   Calling Destroy() frees all allocated ressources and reinitializes the object to the 
+   same state as the constructor does. This allows the reuse of the CPGFImage object for 
+   encoding and decoding: 
+   SetHeader(), ImportBitmap(), Write(), ResetStreamPos(), Destroy(), Open(), Read(), GetBitmap() 
+    
+3. Caching or skipping of user data (meta data) while opening a PGF image can be controlled
+   by a new UserdataPolicy in ConfigureDecoder().
+ 
+
+Version 7.15.25, (Sat, 20 June 2015)
+------------------------------------
+
+1. This new version is a replacement of version 6.14.12. 
+   In case you use the ROI decoding, we strongly encourage using version 6.15.25 instead of an older version.
+
+2. This version fixes some decoder bugs only seen in ROI decoding.
+   ROI decoding is now also supported for Bitmap and RGB12 image modes.
+
+3. This version introduces a new and more efficient data format for binary images (bitmaps). 
+   The new format allows ROI decoding.
+   The decoder supports both the old and the new format, but ROI decoding works only with the new format.
+
+4. The two reserverd bytes in PGFHeader are now used for a more detailled PGF version number.
+
+5. The Visual Studio project files are in the VS12 format.
+
+ 
+Version 6.14.12, (Wed, 9 April 2014)  
+------------------------------------
+ 
+1. The new version is a minor update of version 6.12.24. 
+
+2. It mainly contains some fixes of memory leaks in the OpenMP part and some improvements suggested by cppcheck and Coverity.
+
+3. The Visual Studio project files are in the VS11 format.
+
+
+Version 6.12.24, (Thu, 14 June 2012) 
+------------------------------------ 
+ 
+1. The new version is a replacement of version 6.11.42. 
+   In case you use the ROI encoding scheme, we strongly encourage using version 6.12.24 instead of version 6.11.42.
+ 
+2. This version fixes some decoder bugs, sometimes seen in ROI decoding.
+ 
+3. This version allows a simpler user-data handling, especially for uncached metadata. The following two methods
+   in the class PGFimage are designed for this purpose:
+
+	GetUserDataPos() returns in an opened PGF image the stream position of the user data area.								
+
+	WriteImage() encodes and writes the image at the current stream position. This method is called after
+	WriteHeader(). In case you want to write uncached metadata into the stream, then do that after WriteHeader() 
+	and just before WriteImage(). If you are not interested in writing uncached metadata, then you usually use
+	Write() instead of WriteImage(). WriteHeader() and WriteImage() are called inside of Write(). 
+
+
+Version 6.11.42, (Sun, 23 Oct 2011) 
+----------------------------------- 
+ 
+1. The new version is a replacement of version 6.11.24. 
+   We strongly encourage using version 6.11.42 instead of version 6.11.24.
+ 
+2. This version fixes some decoder bugs, only seen in lossless compression of 
+   large images.
+ 
+3. The rarely used, but sometimes misused, background information (3 Bytes) 
+   in the PGFHeader has been replaced by
+
+     UINT8 usedBitsPerChannel;    // number of used bits per channel 
+                                  // in 16- and 32-bit per channel modes
+     UINT8 reserved1, reserved2;  // not used
+
+The value usedBitsPerChannel is helpful in case you have more than 8 (16) but 
+less than 16 (32) significant bits per channel, stored in the most 
+significant bits of a pixel. For example, you have a grayscale image with 14 
+bit significant data per pixel stored in the ImageModeGray16 pixel format. In 
+case you have left shifted the 14 bits to be the most significant 14 bits, 
+then you should set usedBitsPerChannel=14. This will increase the compression 
+ratio without any drawbacks, because the 14 bits are internally right shifted. 
+On the other side, if the 14 bits are the least significant bits in 
+your 16 bit pixel format, then you shoulden�t set usedBitsPerChannel. It will 
+be automatically set to 16, but this is no problem, since the not used most 
+significant bits per pixel are never coded at all. So, in both cases the same 
+compression ratio will result.
diff --git a/scribus/third_party/pgf/Subband.cpp b/scribus/third_party/pgf/Subband.cpp
index 4ce5f431fc28cc8ead5859917060a26a9d20b4bd..c27b78e4e05f6b9b00f2e1ae9e8f8ef0343a38bf 100644
--- a/scribus/third_party/pgf/Subband.cpp
+++ b/scribus/third_party/pgf/Subband.cpp
@@ -38,8 +38,8 @@ CSubband::CSubband()
 , m_size(0)
 , m_level(0)
 , m_orientation(LL)
-, m_dataPos(0)
 , m_data(0)
+, m_dataPos(0)
 #ifdef __PGFROISUPPORT__
 , m_nTiles(0)
 #endif
@@ -174,7 +174,7 @@ void CSubband::Dequantize(int quantParam) {
 /// @param tile True if just a rectangular region is extracted, false if the entire subband is extracted.
 /// @param tileX Tile index in x-direction
 /// @param tileY Tile index in y-direction
-void CSubband::ExtractTile(CEncoder& encoder, bool tile /*= false*/, UINT32 tileX /*= 0*/, UINT32 tileY /*= 0*/) THROW_ {
+void CSubband::ExtractTile(CEncoder& encoder, bool tile /*= false*/, UINT32 tileX /*= 0*/, UINT32 tileY /*= 0*/) {
 #ifdef __PGFROISUPPORT__
 	if (tile) {
 		// compute tile position and size
@@ -186,6 +186,7 @@ void CSubband::ExtractTile(CEncoder& encoder, bool tile /*= false*/, UINT32 tile
 	} else 
 #endif
 	{
+		tileX; tileY; tile; // prevents from unreferenced formal parameter warning
 		// write values into buffer using partitiong scheme
 		encoder.Partition(this, m_width, m_height, 0, m_width);
 	}
@@ -199,7 +200,7 @@ void CSubband::ExtractTile(CEncoder& encoder, bool tile /*= false*/, UINT32 tile
 /// @param tile True if just a rectangular region is placed, false if the entire subband is placed.
 /// @param tileX Tile index in x-direction
 /// @param tileY Tile index in y-direction
-void CSubband::PlaceTile(CDecoder& decoder, int quantParam, bool tile /*= false*/, UINT32 tileX /*= 0*/, UINT32 tileY /*= 0*/) THROW_ {
+void CSubband::PlaceTile(CDecoder& decoder, int quantParam, bool tile /*= false*/, UINT32 tileX /*= 0*/, UINT32 tileY /*= 0*/) {
 	// allocate memory
 	if (!AllocMemory()) ReturnWithError(InsufficientMemory);
 
@@ -225,6 +226,7 @@ void CSubband::PlaceTile(CDecoder& decoder, int quantParam, bool tile /*= false*
 	} else 
 #endif
 	{
+		tileX; tileY; tile; // prevents from unreferenced formal parameter warning
 		// read values into buffer using partitiong scheme
 		decoder.Partition(this, quantParam, m_width, m_height, 0, m_width);
 	}
@@ -233,6 +235,17 @@ void CSubband::PlaceTile(CDecoder& decoder, int quantParam, bool tile /*= false*
 
 
 #ifdef __PGFROISUPPORT__
+//////////////////////////////////////////////////////////////////////
+/// Set ROI
+void CSubband::SetAlignedROI(const PGFRect& roi) {
+	ASSERT(roi.left <= m_width); 
+	ASSERT(roi.top <= m_height); 
+	
+	m_ROI = roi; 
+	if (m_ROI.right > m_width) m_ROI.right = m_width; 
+	if (m_ROI.bottom > m_height) m_ROI.bottom = m_height;
+}
+
 //////////////////////////////////////////////////////////////////////
 /// Compute tile position and size.
 /// @param tileX Tile index in x-direction
@@ -242,6 +255,7 @@ void CSubband::PlaceTile(CDecoder& decoder, int quantParam, bool tile /*= false*
 /// @param w [out] Tile width
 /// @param h [out] Tile height
 void CSubband::TilePosition(UINT32 tileX, UINT32 tileY, UINT32& xPos, UINT32& yPos, UINT32& w, UINT32& h) const {
+	ASSERT(tileX < m_nTiles); ASSERT(tileY < m_nTiles);
 	// example
 	// band = HH, w = 30, ldTiles = 2 -> 4 tiles in a row/column
 	// --> tile widths
@@ -254,7 +268,6 @@ void CSubband::TilePosition(UINT32 tileX, UINT32 tileY, UINT32& xPos, UINT32& yP
 	// C D E F
 
 	UINT32 nTiles = m_nTiles;
-	ASSERT(tileX < nTiles); ASSERT(tileY < nTiles);
 	UINT32 m;
 	UINT32 left = 0, right = nTiles;
 	UINT32 top = 0, bottom = nTiles;
@@ -291,4 +304,85 @@ void CSubband::TilePosition(UINT32 tileX, UINT32 tileY, UINT32& xPos, UINT32& yP
 	ASSERT(yPos < m_height && (yPos + h <= m_height));
 }
 
+//////////////////////////////////////////////////////////////////////
+/// Compute tile index and extrem position (x,y) of given position (xPos, yPos).
+void CSubband::TileIndex(bool topLeft, UINT32 xPos, UINT32 yPos, UINT32& tileX, UINT32& tileY, UINT32& x, UINT32& y) const {
+	UINT32 m;
+	UINT32 left = 0, right = m_width;
+	UINT32 top = 0, bottom = m_height;
+	UINT32 nTiles = m_nTiles;
+
+	if (xPos > m_width) xPos = m_width;
+	if (yPos > m_height) yPos = m_height;
+
+	if (topLeft) {
+		// compute tileX with binary search
+		tileX = 0;
+		while (nTiles > 1) {
+			nTiles >>= 1;
+			m = left + ((right - left + 1) >> 1);
+			if (xPos < m) {
+				// exclusive m
+				right = m;
+			} else {
+				tileX += nTiles;
+				left = m;
+			}
+		}
+		x = left;
+		ASSERT(tileX >= 0 && tileX < m_nTiles);
+
+		// compute tileY with binary search
+		nTiles = m_nTiles;
+		tileY = 0;
+		while (nTiles > 1) {
+			nTiles >>= 1;
+			m = top + ((bottom - top + 1) >> 1);
+			if (yPos < m) {
+				// exclusive m
+				bottom = m;
+			} else {
+				tileY += nTiles;
+				top = m;
+			}
+		}
+		y = top;
+		ASSERT(tileY >= 0 && tileY < m_nTiles);
+
+	} else {
+		// compute tileX with binary search
+		tileX = 1;
+		while (nTiles > 1) {
+			nTiles >>= 1;
+			m = left + ((right - left + 1) >> 1);
+			if (xPos <= m) {
+				// inclusive m
+				right = m;
+			} else {
+				tileX += nTiles;
+				left = m;
+			}
+		}
+		x = right;
+		ASSERT(tileX > 0 && tileX <= m_nTiles);
+
+		// compute tileY with binary search
+		nTiles = m_nTiles;
+		tileY = 1;
+		while (nTiles > 1) {
+			nTiles >>= 1;
+			m = top + ((bottom - top + 1) >> 1);
+			if (yPos <= m) {
+				// inclusive m
+				bottom = m;
+			} else {
+				tileY += nTiles;
+				top = m;
+			}
+		}
+		y = bottom;
+		ASSERT(tileY > 0 && tileY <= m_nTiles);
+	}
+}
+
 #endif
diff --git a/scribus/third_party/pgf/Subband.h b/scribus/third_party/pgf/Subband.h
index 8e57063c6ba87cb04effe574d5b9ef7563b65971..af333c8bcddc97a1a1ec09818eab6bd7fd0d444f 100644
--- a/scribus/third_party/pgf/Subband.h
+++ b/scribus/third_party/pgf/Subband.h
@@ -41,6 +41,7 @@ class CRoiIndices;
 /// @brief Wavelet channel class
 class CSubband {
 	friend class CWaveletTransform;
+	friend class CRoiIndices;
 
 public:
 	//////////////////////////////////////////////////////////////////////
@@ -68,7 +69,7 @@ public:
 	/// @param tile True if just a rectangular region is extracted, false if the entire subband is extracted.
 	/// @param tileX Tile index in x-direction
 	/// @param tileY Tile index in y-direction
-	void ExtractTile(CEncoder& encoder, bool tile = false, UINT32 tileX = 0, UINT32 tileY = 0) THROW_;
+	void ExtractTile(CEncoder& encoder, bool tile = false, UINT32 tileX = 0, UINT32 tileY = 0);
 
 	/////////////////////////////////////////////////////////////////////
 	/// Decoding and dequantization of this subband.
@@ -78,7 +79,7 @@ public:
 	/// @param tile True if just a rectangular region is placed, false if the entire subband is placed.
 	/// @param tileX Tile index in x-direction
 	/// @param tileY Tile index in y-direction
-	void PlaceTile(CDecoder& decoder, int quantParam, bool tile = false, UINT32 tileX = 0, UINT32 tileY = 0) THROW_;
+	void PlaceTile(CDecoder& decoder, int quantParam, bool tile = false, UINT32 tileX = 0, UINT32 tileY = 0);
 
 	//////////////////////////////////////////////////////////////////////
 	/// Perform subband quantization with given quantization parameter.
@@ -152,9 +153,10 @@ private:
 #ifdef __PGFROISUPPORT__
 	UINT32 BufferWidth() const			{ return m_ROI.Width(); }
 	void TilePosition(UINT32 tileX, UINT32 tileY, UINT32& left, UINT32& top, UINT32& w, UINT32& h) const;
-	const PGFRect& GetROI() const		{ return m_ROI; }
+	void TileIndex(bool topLeft, UINT32 xPos, UINT32 yPos, UINT32& tileX, UINT32& tileY, UINT32& x, UINT32& y) const;
+	const PGFRect& GetAlignedROI() const { return m_ROI; }
 	void SetNTiles(UINT32 nTiles)		{ m_nTiles = nTiles; }
-	void SetROI(const PGFRect& roi)		{ ASSERT(roi.right <= m_width); ASSERT(roi.bottom <= m_height); m_ROI = roi; }
+	void SetAlignedROI(const PGFRect& roi);
 	void InitBuffPos(UINT32 left = 0, UINT32 top = 0)	{ m_dataPos = top*BufferWidth() + left; ASSERT(m_dataPos < m_size); }
 #else
 	void InitBuffPos()					{ m_dataPos = 0; }
@@ -170,7 +172,7 @@ private:
 	DataT* m_data;					///< buffer
 
 #ifdef __PGFROISUPPORT__
-	PGFRect m_ROI;					///< region of interest
+	PGFRect m_ROI;					///< region of interest (block aligned)
 	UINT32	m_nTiles;				///< number of tiles in one dimension in this subband
 #endif
 };
diff --git a/scribus/third_party/pgf/WaveletTransform.cpp b/scribus/third_party/pgf/WaveletTransform.cpp
index 1362e7fd4f5e1106baa154d9fd084973423e7e45..74e74e705ccac93d99254d18e84da46810a89c2a 100644
--- a/scribus/third_party/pgf/WaveletTransform.cpp
+++ b/scribus/third_party/pgf/WaveletTransform.cpp
@@ -38,14 +38,14 @@
 // @param levels The number of levels (>= 0)
 // @param data Input data of subband LL at level 0
 CWaveletTransform::CWaveletTransform(UINT32 width, UINT32 height, int levels, DataT* data) 
-: m_nLevels(levels + 1)
-, m_subband(0) 
+: m_nLevels(levels + 1) // m_nLevels in CPGFImage determines the number of FWT steps; this.m_nLevels determines the number subband-planes
+, m_subband(nullptr)
+#ifdef __PGFROISUPPORT__
+, m_indices(nullptr)
+#endif
 {
 	ASSERT(m_nLevels > 0 && m_nLevels <= MaxLevel + 1);
 	InitSubbands(width, height, data);
-#ifdef __PGFROISUPPORT__
-	m_ROIindices.SetLevels(levels + 1);
-#endif
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -77,11 +77,11 @@ void CWaveletTransform::InitSubbands(UINT32 width, UINT32 height, DataT* data) {
 
 //////////////////////////////////////////////////////////////////////////
 // Compute fast forward wavelet transform of LL subband at given level and
-// stores result on all 4 subbands of level + 1.
+// stores result in all 4 subbands of level + 1.
 // Wavelet transform used in writing a PGF file
 // Forward Transform of srcBand and split and store it into subbands on destLevel
-// high pass filter at even positions: 1/4(-2, 4, -2)
-// low pass filter at odd positions: 1/8(-1, 2, 6, 2, -1)
+// low pass filter at even positions: 1/8[-1, 2, (6), 2, -1]
+// high pass filter at odd positions: 1/4[-2, (4), -2]
 // @param level A wavelet transform pyramid level (>= 0 && < Levels())
 // @param quant A quantization value (linear scalar quantization)
 // @return error in case of a memory allocation problem
@@ -100,18 +100,17 @@ OSError CWaveletTransform::ForwardTransform(int level, int quant) {
 		if (!m_subband[destLevel][i].AllocMemory()) return InsufficientMemory;
 	}
 
- 	if (height >= FilterHeight) {
-		// transform LL subband
+ 	if (height >= FilterSize) { // changed from FilterSizeH to FilterSize
 		// top border handling
 		row0 = src; row1 = row0 + width; row2 = row1 + width;
 		ForwardRow(row0, width);
 		ForwardRow(row1, width);
 		ForwardRow(row2, width);
 		for (UINT32 k=0; k < width; k++) {
-			row1[k] -= ((row0[k] + row2[k] + c1) >> 1);
-			row0[k] += ((row1[k] + c1) >> 1);
+			row1[k] -= ((row0[k] + row2[k] + c1) >> 1); // high pass
+			row0[k] += ((row1[k] + c1) >> 1); // low pass
 		}
-		LinearToMallat(destLevel, row0, row1, width);
+		InterleavedToSubbands(destLevel, row0, row1, width);
 		row0 = row1; row1 = row2; row2 += width; row3 = row2 + width;
 
 		// middle part
@@ -119,27 +118,27 @@ OSError CWaveletTransform::ForwardTransform(int level, int quant) {
 			ForwardRow(row2, width);
 			ForwardRow(row3, width);
 			for (UINT32 k=0; k < width; k++) {
-				row2[k] -= ((row1[k] + row3[k] + c1) >> 1);
-				row1[k] += ((row0[k] + row2[k] + c2) >> 2);
+				row2[k] -= ((row1[k] + row3[k] + c1) >> 1); // high pass filter
+				row1[k] += ((row0[k] + row2[k] + c2) >> 2); // low pass filter
 			}
-			LinearToMallat(destLevel, row1, row2, width);
+			InterleavedToSubbands(destLevel, row1, row2, width);
 			row0 = row2; row1 = row3; row2 = row3 + width; row3 = row2 + width;
 		}
 
 		// bottom border handling
 		if (height & 1) {
 			for (UINT32 k=0; k < width; k++) {
-				row1[k] += ((row0[k] + c1) >> 1);
+				row1[k] += ((row0[k] + c1) >> 1); // low pass
 			}
-			LinearToMallat(destLevel, row1, NULL, width);
+			InterleavedToSubbands(destLevel, row1, nullptr, width);
 			row0 = row1; row1 += width;
 		} else {
 			ForwardRow(row2, width);
 			for (UINT32 k=0; k < width; k++) {
-				row2[k] -= row1[k];
-				row1[k] += ((row0[k] + row2[k] + c2) >> 2);
+				row2[k] -= row1[k]; // high pass
+				row1[k] += ((row0[k] + row2[k] + c2) >> 2); // low pass
 			}
-			LinearToMallat(destLevel, row1, row2, width);
+			InterleavedToSubbands(destLevel, row1, row2, width);
 			row0 = row1; row1 = row2; row2 += width;
 		}
 	} else {
@@ -149,12 +148,12 @@ OSError CWaveletTransform::ForwardTransform(int level, int quant) {
 		for (UINT32 k=0; k < height; k += 2) {
 			ForwardRow(row0, width);
 			ForwardRow(row1, width);
-			LinearToMallat(destLevel, row0, row1, width);
+			InterleavedToSubbands(destLevel, row0, row1, width);
 			row0 += width << 1; row1 += width << 1;
 		}
 		// bottom
 		if (height & 1) {
-			LinearToMallat(destLevel, row0, NULL, width);
+			InterleavedToSubbands(destLevel, row0, nullptr, width);
 		}
 	}
 
@@ -176,37 +175,37 @@ OSError CWaveletTransform::ForwardTransform(int level, int quant) {
 
 //////////////////////////////////////////////////////////////
 // Forward transform one row
-// high pass filter at even positions: 1/4(-2, 4, -2)
-// low pass filter at odd positions: 1/8(-1, 2, 6, 2, -1)
+// low pass filter at even positions: 1/8[-1, 2, (6), 2, -1]
+// high pass filter at odd positions: 1/4[-2, (4), -2]
 void CWaveletTransform::ForwardRow(DataT* src, UINT32 width) {
-	if (width >= FilterWidth) {
+	if (width >= FilterSize) {
 		UINT32 i = 3;
 
 		// left border handling
-		src[1] -= ((src[0] + src[2] + c1) >> 1);
-		src[0] += ((src[1] + c1) >> 1);
+		src[1] -= ((src[0] + src[2] + c1) >> 1); // high pass
+		src[0] += ((src[1] + c1) >> 1); // low pass
 		
 		// middle part
 		for (; i < width-1; i += 2) {
-			src[i] -= ((src[i-1] + src[i+1] + c1) >> 1);
-			src[i-1] += ((src[i-2] + src[i] + c2) >> 2);
+			src[i] -= ((src[i-1] + src[i+1] + c1) >> 1); // high pass
+			src[i-1] += ((src[i-2] + src[i] + c2) >> 2); // low pass
 		}
 
 		// right border handling
 		if (width & 1) {
-			src[i-1] += ((src[i-2] + c1) >> 1);
+			src[i-1] += ((src[i-2] + c1) >> 1); // low pass
 		} else {
-			src[i] -= src[i-1];
-			src[i-1] += ((src[i-2] + src[i] + c2) >> 2);
+			src[i] -= src[i-1]; // high pass
+			src[i-1] += ((src[i-2] + src[i] + c2) >> 2); // low pass
 		}
 	}
 }
 
 /////////////////////////////////////////////////////////////////
-// Copy transformed rows loRow and hiRow to subbands LL,HL,LH,HH
-void CWaveletTransform::LinearToMallat(int destLevel, DataT* loRow, DataT* hiRow, UINT32 width) {
+// Copy transformed and interleaved (L,H,L,H,...) rows loRow and hiRow to subbands LL,HL,LH,HH
+void CWaveletTransform::InterleavedToSubbands(int destLevel, DataT* loRow, DataT* hiRow, UINT32 width) {
 	const UINT32 wquot = width >> 1;
-	const bool wrem = width & 1;
+	const bool wrem = (width & 1);
 	CSubband &ll = m_subband[destLevel][LL], &hl = m_subband[destLevel][HL];
 	CSubband &lh = m_subband[destLevel][LH], &hh = m_subband[destLevel][HH];
 
@@ -235,8 +234,9 @@ void CWaveletTransform::LinearToMallat(int destLevel, DataT* loRow, DataT* hiRow
 // stores result in LL subband of level - 1.
 // Inverse wavelet transform used in reading a PGF file
 // Inverse Transform srcLevel and combine to destBand
-// inverse high pass filter for even positions: 1/4(-1, 4, -1)
-// inverse low pass filter for odd positions: 1/8(-1, 4, 6, 4, -1)
+// low-pass coefficients at even positions, high-pass coefficients at odd positions
+// inverse filter for even positions: 1/4[-1, (4), -1]
+// inverse filter for odd positions: 1/8[-1, 4, (6), 4, -1]
 // @param srcLevel A wavelet transform pyramid level (> 0 && <= Levels())
 // @param w [out] A pointer to the returned width of subband LL (in pixels)
 // @param h [out] A pointer to the returned height of subband LL (in pixels)
@@ -251,14 +251,14 @@ OSError CWaveletTransform::InverseTransform(int srcLevel, UINT32* w, UINT32* h,
 
 	// allocate memory for the results of the inverse transform 
 	if (!destBand->AllocMemory()) return InsufficientMemory;
-	DataT *dest = destBand->GetBuffer(), *origin = dest, *row0, *row1, *row2, *row3;
+	DataT *origin = destBand->GetBuffer(), *row0, *row1, *row2, *row3;
 
 #ifdef __PGFROISUPPORT__
-	PGFRect destROI = destBand->GetROI();	// is valid only after AllocMemory
-	width = destROI.Width();
-	height = destROI.Height();
-	const UINT32 destWidth = width; // destination buffer width
-	const UINT32 destHeight = height; // destination buffer height
+	PGFRect destROI = destBand->GetAlignedROI();	
+	const UINT32 destWidth  = destROI.Width();  // destination buffer width
+	const UINT32 destHeight = destROI.Height(); // destination buffer height
+	width = destWidth;		// destination working width
+	height = destHeight;	// destination working height
 
 	// update destination ROI
 	if (destROI.top & 1) {
@@ -274,15 +274,15 @@ OSError CWaveletTransform::InverseTransform(int srcLevel, UINT32* w, UINT32* h,
 
 	// init source buffer position
 	const UINT32 leftD = destROI.left >> 1;
-	const UINT32 left0 = m_subband[srcLevel][LL].GetROI().left;
-	const UINT32 left1 = m_subband[srcLevel][HL].GetROI().left;
+	const UINT32 left0 = m_subband[srcLevel][LL].GetAlignedROI().left;
+	const UINT32 left1 = m_subband[srcLevel][HL].GetAlignedROI().left;
 	const UINT32 topD = destROI.top >> 1;
-	const UINT32 top0 = m_subband[srcLevel][LL].GetROI().top;
-	const UINT32 top1 = m_subband[srcLevel][LH].GetROI().top;
-	ASSERT(m_subband[srcLevel][LH].GetROI().left == left0);
-	ASSERT(m_subband[srcLevel][HH].GetROI().left == left1);
-	ASSERT(m_subband[srcLevel][HL].GetROI().top == top0);
-	ASSERT(m_subband[srcLevel][HH].GetROI().top == top1);
+	const UINT32 top0 = m_subband[srcLevel][LL].GetAlignedROI().top;
+	const UINT32 top1 = m_subband[srcLevel][LH].GetAlignedROI().top;
+	ASSERT(m_subband[srcLevel][LH].GetAlignedROI().left == left0);
+	ASSERT(m_subband[srcLevel][HH].GetAlignedROI().left == left1);
+	ASSERT(m_subband[srcLevel][HL].GetAlignedROI().top == top0);
+	ASSERT(m_subband[srcLevel][HH].GetAlignedROI().top == top1);
 
 	UINT32 srcOffsetX[2] = { 0, 0 };
 	UINT32 srcOffsetY[2] = { 0, 0 };
@@ -323,7 +323,7 @@ OSError CWaveletTransform::InverseTransform(int srcLevel, UINT32* w, UINT32* h,
 			srcOffsetY[1] = top0 - top1;
 		}
 	}
-		
+
 	m_subband[srcLevel][LL].InitBuffPos(srcOffsetX[0], srcOffsetY[0]);
 	m_subband[srcLevel][HL].InitBuffPos(srcOffsetX[1], srcOffsetY[0]);
 	m_subband[srcLevel][LH].InitBuffPos(srcOffsetX[0], srcOffsetY[1]);
@@ -337,26 +337,26 @@ OSError CWaveletTransform::InverseTransform(int srcLevel, UINT32* w, UINT32* h,
 	const UINT32 destHeight = height; // destination buffer height
 
 	// init source buffer position
-	for (int i=0; i < NSubbands; i++) {
+	for (int i = 0; i < NSubbands; i++) {
 		m_subband[srcLevel][i].InitBuffPos();
 	}
 #endif
 
-	if (destHeight >= FilterHeight) {
+	if (destHeight >= FilterSize) { // changed from FilterSizeH to FilterSize
 		// top border handling
 		row0 = origin; row1 = row0 + destWidth;
-		MallatToLinear(srcLevel, row0, row1, width);
-		for (UINT32 k=0; k < width; k++) {
-			row0[k] -= ((row1[k] + c1) >> 1);
+		SubbandsToInterleaved(srcLevel, row0, row1, width);
+		for (UINT32 k = 0; k < width; k++) {
+			row0[k] -= ((row1[k] + c1) >> 1); // even
 		}
 
 		// middle part
 		row2 = row1 + destWidth; row3 = row2 + destWidth;
-		for (UINT32 i=destROI.top + 2; i < destROI.bottom - 1; i += 2) {
-			MallatToLinear(srcLevel, row2, row3, width);
-			for (UINT32 k=0; k < width; k++) {
-				row2[k] -= ((row1[k] + row3[k] + c2) >> 2);
-				row1[k] += ((row0[k] + row2[k] + c1) >> 1);
+		for (UINT32 i = destROI.top + 2; i < destROI.bottom - 1; i += 2) {
+			SubbandsToInterleaved(srcLevel, row2, row3, width);
+			for (UINT32 k = 0; k < width; k++) {
+				row2[k] -= ((row1[k] + row3[k] + c2) >> 2); // even
+				row1[k] += ((row0[k] + row2[k] + c1) >> 1); // odd
 			}
 			InverseRow(row0, width);
 			InverseRow(row1, width);
@@ -365,17 +365,17 @@ OSError CWaveletTransform::InverseTransform(int srcLevel, UINT32* w, UINT32* h,
 
 		// bottom border handling
 		if (height & 1) {
-			MallatToLinear(srcLevel, row2, NULL, width);
-			for (UINT32 k=0; k < width; k++) {
-				row2[k] -= ((row1[k] + c1) >> 1);
-				row1[k] += ((row0[k] + row2[k] + c1) >> 1);
+			SubbandsToInterleaved(srcLevel, row2, nullptr, width);
+			for (UINT32 k = 0; k < width; k++) {
+				row2[k] -= ((row1[k] + c1) >> 1); // even
+				row1[k] += ((row0[k] + row2[k] + c1) >> 1); // odd
 			}
 			InverseRow(row0, width);
 			InverseRow(row1, width);
 			InverseRow(row2, width);
 			row0 = row1; row1 = row2; row2 += destWidth;
 		} else {
-			for (UINT32 k=0; k < width; k++) {
+			for (UINT32 k = 0; k < width; k++) {
 				row1[k] += row0[k];
 			}
 			InverseRow(row0, width);
@@ -386,63 +386,64 @@ OSError CWaveletTransform::InverseTransform(int srcLevel, UINT32* w, UINT32* h,
 		// height is too small
 		row0 = origin; row1 = row0 + destWidth;
 		// first part
-		for (UINT32 k=0; k < height; k += 2) {
-			MallatToLinear(srcLevel, row0, row1, width);
+		for (UINT32 k = 0; k < height; k += 2) {
+			SubbandsToInterleaved(srcLevel, row0, row1, width);
 			InverseRow(row0, width);
 			InverseRow(row1, width);
 			row0 += destWidth << 1; row1 += destWidth << 1;
 		}
 		// bottom
 		if (height & 1) {
-			MallatToLinear(srcLevel, row0, NULL, width);
+			SubbandsToInterleaved(srcLevel, row0, nullptr, width);
 			InverseRow(row0, width);
-		} 
+		}
 	}
 
 	// free memory of the current srcLevel
-	for (int i=0; i < NSubbands; i++) {
+	for (int i = 0; i < NSubbands; i++) {
 		m_subband[srcLevel][i].FreeMemory();
 	}
 
 	// return info
 	*w = destWidth;
-	*h = height;
-	*data = dest;
+	*h = destHeight;
+	*data = destBand->GetBuffer();
 	return NoError;
 }
 
 //////////////////////////////////////////////////////////////////////
 // Inverse Wavelet Transform of one row
-// inverse high pass filter for even positions: 1/4(-1, 4, -1)
-// inverse low pass filter for odd positions: 1/8(-1, 4, 6, 4, -1)
+// low-pass coefficients at even positions, high-pass coefficients at odd positions
+// inverse filter for even positions: 1/4[-1, (4), -1]
+// inverse filter for odd positions: 1/8[-1, 4, (6), 4, -1]
 void CWaveletTransform::InverseRow(DataT* dest, UINT32 width) {
-	if (width >= FilterWidth) {
+	if (width >= FilterSize) {
 		UINT32 i = 2;
 
 		// left border handling
-		dest[0] -= ((dest[1] + c1) >> 1);
+		dest[0] -= ((dest[1] + c1) >> 1); // even
 
 		// middle part
 		for (; i < width - 1; i += 2) {
-			dest[i] -= ((dest[i-1] + dest[i+1] + c2) >> 2);
-			dest[i-1] += ((dest[i-2] + dest[i] + c1) >> 1);
+			dest[i] -= ((dest[i-1] + dest[i+1] + c2) >> 2); // even
+			dest[i-1] += ((dest[i-2] + dest[i] + c1) >> 1); // odd
 		}
 
 		// right border handling
 		if (width & 1) {
-			dest[i] -= ((dest[i-1] + c1) >> 1);
-			dest[i-1] += ((dest[i-2] + dest[i] + c1) >> 1);
+			dest[i] -= ((dest[i-1] + c1) >> 1); // even
+			dest[i-1] += ((dest[i-2] + dest[i] + c1) >> 1); // odd
 		} else {
-			dest[i-1] += dest[i-2];
+			dest[i-1] += dest[i-2]; // odd
 		}
 	}
 }
 
 ///////////////////////////////////////////////////////////////////
-// Copy transformed coefficients from subbands LL,HL,LH,HH to interleaved format
-void CWaveletTransform::MallatToLinear(int srcLevel, DataT* loRow, DataT* hiRow, UINT32 width) {
+// Copy transformed coefficients from subbands LL,HL,LH,HH to interleaved format (L,H,L,H,...)
+void CWaveletTransform::SubbandsToInterleaved(int srcLevel, DataT* loRow, DataT* hiRow, UINT32 width) {
 	const UINT32 wquot = width >> 1;
-	const bool wrem = width & 1;
+	const bool wrem = (width & 1);
 	CSubband &ll = m_subband[srcLevel][LL], &hl = m_subband[srcLevel][HL];
 	CSubband &lh = m_subband[srcLevel][LH], &hh = m_subband[srcLevel][HH];
 
@@ -512,99 +513,57 @@ void CWaveletTransform::MallatToLinear(int srcLevel, DataT* loRow, DataT* hiRow,
 
 #ifdef __PGFROISUPPORT__
 //////////////////////////////////////////////////////////////////////
-/// Compute and store ROIs for each level
-/// @param rect rectangular region of interest (ROI)
-void CWaveletTransform::SetROI(const PGFRect& rect) {
-	// create tile indices
-	m_ROIindices.CreateIndices();
-
-	// compute tile indices
-	m_ROIindices.ComputeIndices(m_subband[0][LL].GetWidth(), m_subband[0][LL].GetHeight(), rect);
-
-	// compute ROIs
-	UINT32 w, h;
-	PGFRect r;
-
-	for (int i=0; i < m_nLevels; i++) {
-		const PGFRect& indices = m_ROIindices.GetIndices(i);
-
-		for (int o=0; o < NSubbands; o++) {
-			CSubband& subband = m_subband[i][o];
+/// Compute and store ROIs for nLevels
+/// @param roi rectangular region of interest at level 0
+void CWaveletTransform::SetROI(PGFRect roi) {
+	const UINT32 delta = (FilterSize >> 1) << m_nLevels;
 
-			subband.SetNTiles(m_ROIindices.GetNofTiles(i)); // must be called before TilePosition()
-			subband.TilePosition(indices.left, indices.top, r.left, r.top, w, h);
-			subband.TilePosition(indices.right - 1, indices.bottom - 1, r.right, r.bottom, w, h);
-			r.right += w;
-			r.bottom += h;
-			subband.SetROI(r);
-		}
-	}
-}
-
-/////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////
-void CRoiIndices::CreateIndices() {
-	if (!m_indices) {
-		// create tile indices 
-		m_indices = new PGFRect[m_nLevels];
-	}
-}
-
-//////////////////////////////////////////////////////////////////////
-/// Computes a tile index either in x- or y-direction for a given image position.
-/// @param width PGF image width
-/// @param height PGF image height
-/// @param pos A valid image position: (0 <= pos < width) or (0 <= pos < height)
-/// @param horizontal If true, then pos must be a x-value, otherwise a y-value
-/// @param isMin If true, then pos is left/top, else pos right/bottom
-void CRoiIndices::ComputeTileIndex(UINT32 width, UINT32 height, UINT32 pos, bool horizontal, bool isMin) {
-	ASSERT(m_indices);
-
-	UINT32 m;
-	UINT32 tileIndex = 0;
-	UINT32 tileMin = 0, tileMax = (horizontal) ? width : height;
-	ASSERT(pos <= tileMax);
-
-	// compute tile index with binary search
-	for (int i=m_nLevels - 1; i >= 0; i--) {
-		// store values
-		if (horizontal) {
-			if (isMin) {
-				m_indices[i].left = tileIndex;
-			} else {
-				m_indices[i].right = tileIndex + 1;
-			}
-		} else {
-			if (isMin) {
-				m_indices[i].top = tileIndex;
-			} else {
-				m_indices[i].bottom = tileIndex + 1;
-			}
+	// create tile indices
+	delete[] m_indices;
+	m_indices = new PGFRect[m_nLevels];
+
+	// enlarge rect: add margin
+	roi.left = (roi.left > delta) ? roi.left - delta : 0;
+	roi.top  = (roi.top  > delta) ? roi.top  - delta : 0;
+	roi.right += delta; 
+	roi.bottom += delta; 
+
+	for (int l = 0; l < m_nLevels; l++) {
+		PGFRect alignedROI;
+		PGFRect& indices = m_indices[l];
+		UINT32 nTiles = GetNofTiles(l);
+		CSubband& subband = m_subband[l][LL];
+
+		// use roi to determine the necessary tile indices (for all subbands the same) and aligned ROI for LL subband
+		subband.SetNTiles(nTiles); // must be called before TileIndex()
+		subband.TileIndex(true, roi.left, roi.top, indices.left, indices.top, alignedROI.left, alignedROI.top);
+		subband.TileIndex(false, roi.right, roi.bottom, indices.right, indices.bottom, alignedROI.right, alignedROI.bottom);
+		subband.SetAlignedROI(alignedROI);
+		ASSERT(l == 0 ||
+			(m_indices[l-1].left >= 2*m_indices[l].left &&
+			m_indices[l-1].top >= 2*m_indices[l].top &&
+			m_indices[l-1].right <= 2*m_indices[l].right &&
+			m_indices[l-1].bottom <= 2*m_indices[l].bottom));
+
+		// determine aligned ROI of other three subbands
+		PGFRect aroi;
+		UINT32 w, h;
+		for (int b = 1; b < NSubbands; b++) {
+			CSubband& sb = m_subband[l][b];
+			sb.SetNTiles(nTiles); // must be called before TilePosition()
+			sb.TilePosition(indices.left, indices.top, aroi.left, aroi.top, w, h);
+			sb.TilePosition(indices.right - 1, indices.bottom - 1, aroi.right, aroi.bottom, w, h);
+			aroi.right += w;
+			aroi.bottom += h;
+			sb.SetAlignedROI(aroi);
 		}
 
-		// compute values
-		tileIndex <<= 1;
-		m = tileMin + (tileMax - tileMin)/2;
-		if (pos >= m) {
-			tileMin = m;
-			tileIndex++;
-		} else {
-			tileMax = m;
-		}
+		// use aligned ROI of LL subband for next level
+		roi.left = alignedROI.left >> 1;
+		roi.top = alignedROI.top >> 1;
+		roi.right = (alignedROI.right + 1) >> 1;
+		roi.bottom = (alignedROI.bottom + 1) >> 1;
 	}
 }
 
-/////////////////////////////////////////////////////////////////////
-/// Compute tile indices for given rectangle (ROI)
-/// @param width PGF image width
-/// @param height PGF image height
-/// @param rect ROI
-void CRoiIndices::ComputeIndices(UINT32 width, UINT32 height, const PGFRect& rect) {
-	ComputeTileIndex(width, height, rect.left, true, true);
-	ComputeTileIndex(width, height, rect.top, false, true);
-	ComputeTileIndex(width, height, rect.right, true, false);
-	ComputeTileIndex(width, height, rect.bottom, false, false);
-}
-
 #endif // __PGFROISUPPORT__
diff --git a/scribus/third_party/pgf/WaveletTransform.h b/scribus/third_party/pgf/WaveletTransform.h
index 8b59498e0e2eb6f211fc41e46a0aad5e668c7b98..fbc3e68c3da98b7337e6dce1e4d724e784ca5cf4 100644
--- a/scribus/third_party/pgf/WaveletTransform.h
+++ b/scribus/third_party/pgf/WaveletTransform.h
@@ -34,8 +34,9 @@
 
 //////////////////////////////////////////////////////////////////////
 // Constants
-#define FilterWidth			5					///< number of coefficients of the row wavelet filter
-#define FilterHeight		3					///< number of coefficients of the column wavelet filter
+const UINT32 FilterSizeL = 5;					///< number of coefficients of the low pass filter
+const UINT32 FilterSizeH = 3;					///< number of coefficients of the high pass filter
+const UINT32 FilterSize = __max(FilterSizeL, FilterSizeH);
 
 #ifdef __PGFROISUPPORT__
 //////////////////////////////////////////////////////////////////////
@@ -43,36 +44,6 @@
 /// @author C. Stamm
 /// @brief ROI indices
 class CRoiIndices {
-	friend class CWaveletTransform;
-
-	//////////////////////////////////////////////////////////////////////
-	/// Constructor: Creates a ROI helper object
-	CRoiIndices() 
-	: m_nLevels(0)
-	, m_indices(0) 
-	{}
-
-	//////////////////////////////////////////////////////////////////////
-	/// Destructor
-	~CRoiIndices() { Destroy(); }
-
-	void Destroy()								{ delete[] m_indices; m_indices = 0; }
-	void CreateIndices();
-	void ComputeIndices(UINT32 width, UINT32 height, const PGFRect& rect);
-	const PGFRect& GetIndices(int level) const	{ ASSERT(m_indices); ASSERT(level >= 0 && level < m_nLevels); return m_indices[level]; }
-	void SetLevels(int levels)					{ ASSERT(levels > 0); m_nLevels = levels; }
-	void ComputeTileIndex(UINT32 width, UINT32 height, UINT32 pos, bool horizontal, bool isMin);
-
-public:
-	//////////////////////////////////////////////////////////////////////
-	/// Returns the number of tiles in one dimension at given level.
-	/// @param level A wavelet transform pyramid level (>= 0 && < Levels())
-	UINT32 GetNofTiles(int level) const			{ ASSERT(level >= 0 && level < m_nLevels); return 1 << (m_nLevels - level - 1); }
-
-private:
-	int      m_nLevels;			///< number of levels of the image
-	PGFRect *m_indices;			///< array of tile indices (index is level)
-
 };
 #endif //__PGFROISUPPORT__
 
@@ -91,7 +62,7 @@ public:
 	/// @param height The height of the original image (at level 0) in pixels
 	/// @param levels The number of levels (>= 0)
 	/// @param data Input data of subband LL at level 0
-	CWaveletTransform(UINT32 width, UINT32 height, int levels, DataT* data = NULL);
+	CWaveletTransform(UINT32 width, UINT32 height, int levels, DataT* data = nullptr);
 
 	//////////////////////////////////////////////////////////////////////
 	/// Destructor
@@ -99,7 +70,7 @@ public:
 	
 	//////////////////////////////////////////////////////////////////////
 	/// Compute fast forward wavelet transform of LL subband at given level and
-	/// stores result on all 4 subbands of level + 1.
+	/// stores result in all 4 subbands of level + 1.
 	/// @param level A wavelet transform pyramid level (>= 0 && < Levels())
 	/// @param quant A quantization value (linear scalar quantization)
 	/// @return error in case of a memory allocation problem
@@ -126,45 +97,48 @@ public:
 	
 #ifdef __PGFROISUPPORT__
 	//////////////////////////////////////////////////////////////////////
-	/// Compute and store ROIs for each level
-	/// @param rect rectangular region of interest (ROI)
-	void SetROI(const PGFRect& rect);
+	/// Compute and store ROIs for nLevels
+	/// @param rect rectangular region of interest (ROI) at level 0
+	void SetROI(PGFRect rect);
 
 	//////////////////////////////////////////////////////////////////////
-	/// Get tile indices of a ROI at given level.
+	/// Checks the relevance of a given tile at given level.
 	/// @param level A valid subband level.
-	const PGFRect& GetTileIndices(int level) const		{ return m_ROIindices.GetIndices(level); }
+	/// @param tileX x-index of the given tile
+	/// @param tileY y-index of the given tile
+	const bool TileIsRelevant(int level, UINT32 tileX, UINT32 tileY) const { ASSERT(m_indices); ASSERT(level >= 0 && level < m_nLevels); return m_indices[level].IsInside(tileX, tileY); }
 
 	//////////////////////////////////////////////////////////////////////
-	/// Get number of tiles in x- or y-direction at given level.
+	/// Get number of tiles in x- or y-direction at given level. 
+	/// This number is independent of the given ROI.
 	/// @param level A valid subband level.
-	UINT32 GetNofTiles(int level) const					{ return m_ROIindices.GetNofTiles(level); }
+	UINT32 GetNofTiles(int level) const { ASSERT(level >= 0 && level < m_nLevels); return 1 << (m_nLevels - level - 1); }
 
 	//////////////////////////////////////////////////////////////////////
 	/// Return ROI at given level.
 	/// @param level A valid subband level.
-	const PGFRect& GetROI(int level) const				{ return m_subband[level][LL].GetROI(); }
+	const PGFRect& GetAlignedROI(int level) const		{ return m_subband[level][LL].GetAlignedROI(); }
 
 #endif // __PGFROISUPPORT__
 
 private:
 	void Destroy() { 
-		delete[] m_subband; m_subband = 0; 
+		delete[] m_subband; m_subband = nullptr;
 	#ifdef __PGFROISUPPORT__
-		m_ROIindices.Destroy(); 
+		delete[] m_indices; m_indices = nullptr;
 	#endif
 	}
 	void InitSubbands(UINT32 width, UINT32 height, DataT* data);
 	void ForwardRow(DataT* buff, UINT32 width);
 	void InverseRow(DataT* buff, UINT32 width);
-	void LinearToMallat(int destLevel,DataT* loRow, DataT* hiRow, UINT32 width);
-	void MallatToLinear(int srcLevel, DataT* loRow, DataT* hiRow, UINT32 width);
+	void InterleavedToSubbands(int destLevel, DataT* loRow, DataT* hiRow, UINT32 width);
+	void SubbandsToInterleaved(int srcLevel, DataT* loRow, DataT* hiRow, UINT32 width);
 
 #ifdef __PGFROISUPPORT__
-	CRoiIndices		m_ROIindices;				///< ROI indices 
+	PGFRect *m_indices;							///< array of length m_nLevels of tile indices
 #endif //__PGFROISUPPORT__
 
-	int			m_nLevels;						///< number of transform levels: one more than the number of level in PGFimage
+	int			m_nLevels;						///< number of LL levels: one more than header.nLevels in PGFimage
 	CSubband	(*m_subband)[NSubbands];		///< quadtree of subbands: LL HL LH HH
 };
 
libpgf.diff (269,637 bytes)

Issue History

Date Modified Username Field Change
2019-12-02 15:56 ale New Issue
2019-12-02 23:58 christoph_s Note Added: 0047190
2019-12-03 11:03 ale Note Added: 0047191
2019-12-08 21:35 cbradney Note Added: 0047214
2019-12-08 21:37 cbradney Note Added: 0047215
2019-12-08 21:47 ale Note Added: 0047217
2019-12-09 10:58 ale Note Added: 0047227
2019-12-09 11:02 ale Note Added: 0047228
2019-12-09 11:03 ale Note Edited: 0047228 View Revisions
2019-12-09 11:21 cbradney Note Added: 0047229
2019-12-13 09:45 ale File Added: libpgf.diff
2019-12-13 09:45 ale Note Added: 0047262
2019-12-13 10:06 ale Summary thirdparty/pgf: libpgf is packaged for debian and maintained => [PATCH] thirdparty/pgf: libpgf is packaged for debian and maintained
2019-12-13 10:06 ale Patch No => Yes
2019-12-13 17:39 ale Note Edited: 0047262 View Revisions