Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not detach the output image when setting dots per-meter in QPngHandler::read()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-12-17 02:05:53 +02:00
parent 7a0ac19823
commit ebd8ff5e17
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/image/qimage.h
View file

@ -212,6 +212,7 @@ private:
friend class QX11PixmapData;
friend class QX11AlphaDetector;
friend class QSpanData;
friend class QPngHandler;
};
Q_DECLARE_TYPEINFO(QImage, Q_MOVABLE_TYPE);

10
src/gui/image/qpnghandler.cpp
View file

@ -20,13 +20,9 @@
****************************************************************************/
#include "qpnghandler_p.h"
#include "qcoreapplication.h"
#include "qiodevice.h"
#include "qimage.h"
#include "qlist.h"
#include "qtextcodec.h"
#include "qvariant.h"
#include "qvector.h"
#include "qimage_p.h"
#include "qdrawhelper_p.h"
#include "qguicommon_p.h"
@ -339,8 +335,8 @@ bool QPngHandler::read(QImage *image)
png_read_image(png_ptr, row_pointers);
image->setDotsPerMeterX(png_get_x_pixels_per_meter(png_ptr,info_ptr));
image->setDotsPerMeterY(png_get_y_pixels_per_meter(png_ptr,info_ptr));
image->d->dpmx = png_get_x_pixels_per_meter(png_ptr,info_ptr);
image->d->dpmy = png_get_y_pixels_per_meter(png_ptr,info_ptr);
png_read_end(png_ptr, end_info);