From scribus-commit at lists.scribus.net Sat May 1 02:26:20 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 01 May 2021 02:26:20 -0000 Subject: r24643 by jghali - Code cleanup Message-ID: Author: jghali Date: Sat May 1 02:26:20 2021 New Revision: 24643 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24643 Log: Code cleanup Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.h Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h Sat May 1 02:26:20 2021 @@ -18,6 +18,31 @@ class ScImgDataLoader { +public: + virtual ~ScImgDataLoader() {}; + + const QStringList& supportedFormats() const { return m_supportedFormats; } + bool supportFormat(const QString& fmt); + + RawImage r_image; + + QImage& image() { return m_image; } + QByteArray& embeddedProfile() { return m_embeddedProfile; } + ImageInfoRecord& imageInfoRecord() { return m_imageInfoRecord; } + eColorFormat pixelFormat() { return m_pixelFormat; } + void setRequest(bool valid, const QMap& req); + + bool issuedErrorMsg(void) const { return (m_msgType == errorMsg); } + bool issuedWarningMsg(void) const { return (m_msgType == warningMsg); } + const QString& getMessage(void) const { return m_message; } + + virtual void initialize(void); + + virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) = 0; + virtual void loadEmbeddedProfile(const QString& fn, int page = 0) = 0; + virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail) = 0; + virtual bool useRawImage() const { return false; } + protected: ScImgDataLoader(); @@ -44,32 +69,6 @@ QString getPascalString(QDataStream & s); double decodePSDfloat(uint data); void parseResourceData( QDataStream & s, const PSDHeader & header, uint size ); - -public: - virtual ~ScImgDataLoader() {}; - - const QStringList& supportedFormats() const { return m_supportedFormats; } - bool supportFormat(const QString& fmt); - - RawImage r_image; - - QImage& image() { return m_image; } - QByteArray& embeddedProfile() { return m_embeddedProfile; } - ImageInfoRecord& imageInfoRecord() { return m_imageInfoRecord; } - eColorFormat pixelFormat() { return m_pixelFormat; } - void setRequest(bool valid, const QMap& req); - - bool issuedErrorMsg(void) const { return (m_msgType == errorMsg); } - bool issuedWarningMsg(void) const { return (m_msgType == warningMsg); } - const QString& getMessage(void) const { return m_message; } - - void initialize(void); - -// virtual void preloadAlphaChannel(const QString& fn, int res) = 0; - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) = 0; - virtual void loadEmbeddedProfile(const QString& fn, int page = 0) = 0; - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail) = 0; - virtual bool useRawImage() { return false; } }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.h Sat May 1 02:26:20 2021 @@ -11,17 +11,15 @@ class ScImgDataLoader_GIMP : public ScImgDataLoader { -protected: - - void initSupportedFormatList(); - public: ScImgDataLoader_GIMP(); -// virtual void preloadAlphaChannel(const QString& fn, int res); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + +protected: + void initSupportedFormatList(); }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.h Sat May 1 02:26:20 2021 @@ -25,21 +25,19 @@ class ScImgDataLoader_JPEG : public ScImgDataLoader { +public: + ScImgDataLoader_JPEG(); + + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + protected: - void initSupportedFormatList(); bool marker_is_icc (jpeg_saved_marker_ptr marker); bool marker_is_photoshop (jpeg_saved_marker_ptr marker); bool read_jpeg_marker (UINT8 requestmarker, j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned int *icc_data_len); - -public: - ScImgDataLoader_JPEG(); - -// virtual void preloadAlphaChannel(const QString& fn, int res); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.h Sat May 1 02:26:20 2021 @@ -18,9 +18,9 @@ public: ScImgDataLoader_KRA(); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; protected: void initSupportedFormatList(); Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.h Sat May 1 02:26:20 2021 @@ -18,9 +18,10 @@ public: ScImgDataLoader_ORA(); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + protected: void initSupportedFormatList(); void parseStackXML(QDomElement &elem, ScPainter *painter, ScZipHandler *uz); Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.h Sat May 1 02:26:20 2021 @@ -11,17 +11,15 @@ class ScImgDataLoader_PDF : public ScImgDataLoader { -protected: - - void initSupportedFormatList(); - public: ScImgDataLoader_PDF(); -// virtual void preloadAlphaChannel(const QString& fn, int res); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + +protected: + void initSupportedFormatList(); }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.h Sat May 1 02:26:20 2021 @@ -11,16 +11,15 @@ class ScImgDataLoader_PGF : public ScImgDataLoader { -protected: - - void initSupportedFormatList(); - public: ScImgDataLoader_PGF(); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + +protected: + void initSupportedFormatList(); }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.h Sat May 1 02:26:20 2021 @@ -20,16 +20,15 @@ class ScImgDataLoader_PICT : public ScImgDataLoader { -protected: - - void initSupportedFormatList(); - public: ScImgDataLoader_PICT(); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + +protected: + void initSupportedFormatList(); private: void parseHeader(const QString& fName, double &x, double &y, double &w, double &h); Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_png.h Sat May 1 02:26:20 2021 @@ -15,8 +15,8 @@ public: ScImgDataLoader_PNG(); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; protected: void initSupportedFormatList(); Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.h Sat May 1 02:26:20 2021 @@ -12,8 +12,16 @@ class ScImgDataLoader_PS : public ScImgDataLoader { +public: + ScImgDataLoader_PS(); + + void initialize() override; + + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + protected: - void initSupportedFormatList(); void scanForFonts(const QString& fn); bool parseData(const QString& fn); @@ -55,16 +63,6 @@ QString m_psCommand; QMap m_CustColors; QStringList m_FontListe; - -public: - ScImgDataLoader_PS(); - - virtual void initialize(); - -// virtual void preloadAlphaChannel(const QString& fn, int res); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.h Sat May 1 02:26:20 2021 @@ -30,12 +30,11 @@ ScImgDataLoader_PSD(); -// virtual void preloadAlphaChannel(const QString& fn, int res); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; - virtual bool useRawImage() { return true; } + bool useRawImage() const override { return true; } protected: Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.h Sat May 1 02:26:20 2021 @@ -11,17 +11,15 @@ class ScImgDataLoader_QT : public ScImgDataLoader { -protected: - - void initSupportedFormatList(); - public: ScImgDataLoader_QT(); -// virtual void preloadAlphaChannel(const QString& fn, int res); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + +protected: + void initSupportedFormatList(); }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp Sat May 1 02:26:20 2021 @@ -51,7 +51,7 @@ if (!tif) return; - uint32 EmbedLen = 0; + uint32_t EmbedLen = 0; void* EmbedBuffer; if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) { @@ -156,7 +156,7 @@ if (!tif) return false; - uint16 extrasamples, *extratypes; + uint16_t extrasamples, *extratypes; hasAlpha = false; do { @@ -248,9 +248,9 @@ } } -bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16 photometric, uint16 bitspersample, uint16 samplesperpixel, bool &bilevel, bool &isCMYK) +bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t photometric, uint16_t bitspersample, uint16_t samplesperpixel, bool &bilevel, bool &isCMYK) { - uint32 *bits = nullptr; + uint32_t *bits = nullptr; if (photometric == PHOTOMETRIC_SEPARATED) { if (samplesperpixel > 5) @@ -266,26 +266,26 @@ { if (TIFFIsTiled(tif)) { - uint32 columns, rows; - uint32 *tile_buf; - uint32 xt, yt; + uint32_t columns, rows; + uint32_t *tile_buf; + uint32_t xt, yt; TIFFGetField(tif, TIFFTAG_TILEWIDTH, &columns); TIFFGetField(tif, TIFFTAG_TILELENGTH, &rows); - tile_buf = (uint32*) _TIFFmalloc(columns*rows*sizeof(uint32)); + tile_buf = (uint32_t*) _TIFFmalloc(columns * rows * sizeof(uint32_t)); if (tile_buf == nullptr) { TIFFClose(tif); return false; } - uint32 tileW = columns, tileH = rows; - for (yt = 0; yt < (uint32) image->height(); yt += rows) + uint32_t tileW = columns, tileH = rows; + for (yt = 0; yt < (uint32_t) image->height(); yt += rows) { if (yt > (uint) image->height()) break; if (image->height()-yt < rows) tileH = image->height()-yt; tileW = columns; - uint32 yi; + uint32_t yi; int chans = image->channels(); for (xt = 0; xt < (uint) image->width(); xt += columns) { @@ -301,7 +301,7 @@ else { tsize_t bytesperrow = TIFFScanlineSize(tif); - bits = (uint32 *) _TIFFmalloc(bytesperrow); + bits = (uint32_t *) _TIFFmalloc(bytesperrow); int chans = image->channels(); if (bits) { @@ -351,13 +351,13 @@ return true; } -bool ScImgDataLoader_TIFF::getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16 bitspersample, uint16 samplesperpixel) +bool ScImgDataLoader_TIFF::getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t bitspersample, uint16_t samplesperpixel) { - uint32* bits = (uint32 *) _TIFFmalloc(size * sizeof(uint32)); + uint32_t* bits = (uint32_t *) _TIFFmalloc(size * sizeof(uint32_t)); if (!bits) return false; - uint16 extrasamples(0), *extratypes(nullptr); + uint16_t extrasamples(0), *extratypes(nullptr); if (!TIFFGetField (tif, TIFFTAG_EXTRASAMPLES, &extrasamples, &extratypes)) extrasamples = 0; @@ -371,7 +371,7 @@ { unsigned char *s = image->scanLine( heightt - 1 - y ); unsigned char r, g, b, a; - for (uint xi=0; xi < widtht; ++xi) + for (uint xi = 0; xi < widtht; ++xi) { r = s[0]; g = s[1]; @@ -693,7 +693,7 @@ bool isCMYK = false; unsigned int widtht, heightt, size; char *description=nullptr, *copyright=nullptr, *datetime=nullptr, *artist=nullptr, *scannerMake=nullptr, *scannerModel=nullptr; - uint16 bitspersample, fillorder, planar; + uint16_t bitspersample, fillorder, planar; TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &widtht); TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &heightt); @@ -723,7 +723,7 @@ m_imageInfoRecord.exifInfo.artist = QString(artist); m_imageInfoRecord.exifInfo.thumbnail = QImage(); m_imageInfoRecord.exifDataValid = true; - uint32 EmbedLen = 0; + uint32_t EmbedLen = 0; void* EmbedBuffer; if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) { @@ -1052,7 +1052,7 @@ bool ScImgDataLoader_TIFF::loadChannel( QDataStream & s, const PSDHeader & header, QList &layerInfo, uint layer, int channel, int component, RawImage &tmpImg) { - uint base = s.device()->pos(); + qint64 base = s.device()->pos(); uchar cbyte; ushort compression; s >> compression; @@ -1060,7 +1060,7 @@ return false; if (compression == 0) { - int count = layerInfo[layer].channelLen[channel]-2; + int count = layerInfo[layer].channelLen[channel] - 2; for (int i = 0; i < tmpImg.height(); i++) { uchar *ptr = tmpImg.scanLine(i); @@ -1167,7 +1167,7 @@ } } } - s.device()->seek( base+layerInfo[layer].channelLen[channel] ); + s.device()->seek( base + layerInfo[layer].channelLen[channel] ); return true; } @@ -1323,8 +1323,8 @@ // Known values: // 0: no compression // 1: RLE compressed - uint base = s.device()->pos(); - uint base2 = base; + qint64 base = s.device()->pos(); + qint64 base2 = base; uint channel_num = layerInfo[layer].channelLen.count(); bool hasMask = false; bool hasAlpha = false; Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h Sat May 1 02:26:20 2021 @@ -7,13 +7,25 @@ #ifndef SCIMGDATALOADER_TIFF_H #define SCIMGDATALOADER_TIFF_H +#include #include + #include "scimgdataloader.h" //Added by qt3to4: #include class ScImgDataLoader_TIFF : public ScImgDataLoader { +public: + ScImgDataLoader_TIFF(); + +// virtual void preloadAlphaChannel(const QString& fn, int res); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + + bool useRawImage() const override { return true; } + protected: enum PSDColorMode @@ -29,8 +41,8 @@ }; void initSupportedFormatList(); int getLayers(const QString& fn, int page); - bool getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16 m_photometric, uint16 bitspersample, uint16 m_samplesperpixel, bool &bilevel, bool &isCMYK); - bool getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16 bitspersample, uint16 m_samplesperpixel); + bool getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t m_photometric, uint16_t bitspersample, uint16_t m_samplesperpixel, bool &bilevel, bool &isCMYK); + bool getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t bitspersample, uint16_t m_samplesperpixel); void blendOntoTarget(RawImage *tmp, int layOpa, const QString& layBlend, bool cmyk, bool useMask); QString getLayerString(QDataStream & s); bool loadChannel( QDataStream & s, const PSDHeader & header, QList &layerInfo, uint layer, int channel, int component, RawImage &tmpImg); @@ -40,18 +52,8 @@ bool testAlphaChannelAvailability(const QString& fn, int page, bool& hasAlpha); void unmultiplyRGBA(RawImage *image); - int m_random_table[4096]; - uint16 m_photometric, m_samplesperpixel; - -public: - ScImgDataLoader_TIFF(); - -// virtual void preloadAlphaChannel(const QString& fn, int res); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); - - virtual bool useRawImage() { return true; } + int m_random_table[4096]; + uint16_t m_photometric, m_samplesperpixel; }; #endif Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp Sat May 1 02:26:20 2021 @@ -323,6 +323,7 @@ } QByteArray ba = file.readAll(); file.close(); + initialize(); libwpg::WPGMemoryStream input(ba.constData(), ba.size()); Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24643&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.h Sat May 1 02:26:20 2021 @@ -56,15 +56,15 @@ class ScImgDataLoader_WPG : public ScImgDataLoader { -protected: - - void initSupportedFormatList(); - public: ScImgDataLoader_WPG(); - virtual bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha); - virtual void loadEmbeddedProfile(const QString& fn, int page = 0); - virtual bool loadPicture(const QString& fn, int page, int res, bool thumbnail); + bool preloadAlphaChannel(const QString& fn, int page, int res, bool& hasAlpha) override; + void loadEmbeddedProfile(const QString& fn, int page = 0) override; + bool loadPicture(const QString& fn, int page, int res, bool thumbnail) override; + +protected: + void initSupportedFormatList(); }; + #endif From scribus-commit at lists.scribus.net Mon May 10 21:47:39 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 10 May 2021 21:47:39 -0000 Subject: r24644 by jghali - Some cleanup for marks.h header Message-ID: Author: jghali Date: Mon May 10 21:47:39 2021 New Revision: 24644 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24644 Log: Some cleanup for marks.h header Modified: trunk/Scribus/scribus/marks.cpp trunk/Scribus/scribus/marks.h trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp trunk/Scribus/scribus/scribus.cpp trunk/Scribus/scribus/scribusdoc.cpp trunk/Scribus/scribus/text/storytext.cpp Modified: trunk/Scribus/scribus/marks.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24644&path=/trunk/Scribus/scribus/marks.cpp ============================================================================== --- trunk/Scribus/scribus/marks.cpp (original) +++ trunk/Scribus/scribus/marks.cpp Mon May 10 21:47:39 2021 @@ -20,45 +20,35 @@ m_data = d; } -void Mark::getMark(QString& l, MarkType& t) const +void Mark::getDestMark(QString& l, MarkType& t) const { - l = m_data.destmarkName; - t = m_data.destmarkType; + l = m_data.destMarkName; + t = m_data.destMarkType; } -void Mark::setMark(Mark* mP) +void Mark::setDestMark(Mark* mP) { if (mP == nullptr) { - m_data.destmarkName.clear(); - m_data.destmarkType = MARKNoType; + m_data.destMarkName.clear(); + m_data.destMarkType = MARKNoType; } else { - m_data.destmarkName = mP->label; - m_data.destmarkType = mP->getType(); + m_data.destMarkName = mP->label; + m_data.destMarkType = mP->getType(); } } -void Mark::setMark(const QString& l, MarkType t) +void Mark::setDestMark(const QString& l, MarkType t) { - m_data.destmarkName = l; - m_data.destmarkType = t; -} - -QString Mark::getString() const -{ - return m_data.strtxt; -} - -void Mark::setString(const QString& str) -{ - m_data.strtxt = str; + m_data.destMarkName = l; + m_data.destMarkType = t; } void Mark::clearString() { - m_data.strtxt.clear(); + m_data.text.clear(); } void Mark::setNotePtr(TextNote* note) @@ -73,12 +63,12 @@ bool Mark::hasString() const { - return !m_data.strtxt.isEmpty(); + return !m_data.text.isEmpty(); } bool Mark::hasMark() const { - return !m_data.destmarkName.isEmpty(); + return !m_data.destMarkName.isEmpty(); } bool Mark::isUnique() const Modified: trunk/Scribus/scribus/marks.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24644&path=/trunk/Scribus/scribus/marks.h ============================================================================== --- trunk/Scribus/scribus/marks.h (original) +++ trunk/Scribus/scribus/marks.h Mon May 10 21:47:39 2021 @@ -25,16 +25,14 @@ struct MarkData { - QString strtxt; - PageItem* itemPtr {nullptr}; - QString destmarkName; - MarkType destmarkType {MARKNoType}; - TextNote* notePtr {nullptr}; - //fields used for resolving to pointers for load and copy - QString itemName; - MarkType markType {MARKNoType}; - MarkData() {} + + QString text; + QString itemName; + PageItem* itemPtr { nullptr }; + TextNote* notePtr { nullptr }; + QString destMarkName; + MarkType destMarkType {MARKNoType}; }; class SCRIBUS_API Mark @@ -42,37 +40,45 @@ friend class ScribusDoc; friend class ScribusMainWindow; friend class BulNumMark; + //only ScribusDoc && ScribusMainWindow can create and delete marks private: Mark() : m_data() {} Mark(const Mark& other); public: + virtual ~Mark() {} + QString label; int OwnPage {-1}; + MarkType getType() const { return m_type; } + void setType(MarkType t) { m_type = t; } + + const MarkData& getData() const { return m_data; } + void setData(const MarkData& d) { m_data = d; } + + PageItem* getItemPtr() const { return m_data.itemPtr; } + void setItemPtr( PageItem* ptr ) { m_data.itemPtr = ptr; } + + const QString getItemName() const { return m_data.itemName; } + void setItemName( const QString name) { m_data.itemName = name; } + + const QString& getString() const { return m_data.text; } + void setString(const QString& str) { m_data.text = str; } + + TextNote* getNotePtr() const { return m_data.notePtr; } + void setNotePtr(TextNote *note); + void setValues(const QString& l, int p, MarkType t, const MarkData& d); - MarkType getType() const { return m_type; } - void setType(MarkType t) { m_type = t; } - const MarkData getData() const { return m_data; } - void setData(const MarkData d) { m_data = d; } - PageItem* getItemPtr() const { return m_data.itemPtr; } - void setItemPtr( PageItem* ptr ) { m_data.itemPtr = ptr; } - const QString getItemName() const { return m_data.itemName; } - void setItemName( const QString name ) { m_data.itemName = name; } - //for marks to marks - return label and type of target mark by reference - void getMark(QString& l, MarkType &t) const; + void getDestMark(QString& l, MarkType &t) const; + const QString& getDestMarkName() const { return m_data.destMarkName; } + MarkType getDestMarkType() const { return m_data.destMarkType; } //for marks to marks - set label and type of target mark from mark pointer - void setMark(Mark* mP); - void setMark(const QString& l, MarkType t); - MarkType getMarkType() const { return m_data.markType; } - void setMarkType(MarkType t) { m_data.markType = t; } - QString getString() const; - void setString(const QString& str ); - TextNote* getNotePtr() const { return m_data.notePtr; } - void setNotePtr(TextNote *note); + void setDestMark(Mark* mP); + void setDestMark(const QString& l, MarkType t); bool hasItemPtr() const; bool hasString() const; @@ -82,8 +88,6 @@ bool isType(const MarkType t) const; void clearString(); - - virtual ~Mark() {} protected: MarkType m_type {MARKNoType}; Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24644&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original) +++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Mon May 10 21:47:39 2021 @@ -3933,7 +3933,7 @@ MarkType mark2Type = (MarkType) attrs.valueAsInt("MARKtype"); Mark* mark2 = doc->getMark(mark2Label, mark2Type); if (mark2 != nullptr) //mark is not defined yet, insert into temp list for update to pointers later - mark->setMark(mark2); + mark->setDestMark(mark2); else { QMap mark2map; @@ -7482,7 +7482,7 @@ Mark* mark2 = m_Doc->getMark(label2, type2); if (mark2 != nullptr) { - mark->setMark(mark2); + mark->setDestMark(mark2); } else { Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24644&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original) +++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Mon May 10 21:47:39 2021 @@ -1472,9 +1472,8 @@ docu.writeAttribute("str", mrk->getString()); else if (mrk->isType(MARK2MarkType) && mrk->hasMark()) { - QString label; - MarkType type; - mrk->getMark(label, type); + QString label = mrk->getDestMarkName(); + MarkType type = mrk->getDestMarkType(); docu.writeAttribute("MARKlabel", label); docu.writeAttribute("MARKtype", type); } Modified: trunk/Scribus/scribus/scribus.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24644&path=/trunk/Scribus/scribus/scribus.cpp ============================================================================== --- trunk/Scribus/scribus/scribus.cpp (original) +++ trunk/Scribus/scribus/scribus.cpp Mon May 10 21:47:39 2021 @@ -9471,9 +9471,9 @@ Mark* mrk = nullptr; Mark oldMark; - MarkData markdata; + MarkData markData; if (currItem != nullptr) - markdata.itemName = currItem->itemName(); + markData.itemName = currItem->itemName(); QString label, text; NotesStyle* NStyle = nullptr; bool insertExistedMark = false; @@ -9484,7 +9484,7 @@ insertMDialog->values(label); if (label.isEmpty()) label = tr("Anchor mark"); - markdata.itemPtr = currItem; + markData.itemPtr = currItem; break; case MARKVariableTextType: mrk = insertMDialog->values(label, text); @@ -9492,27 +9492,27 @@ return false; //FIX ME here user should be warned that inserting of mark fails and why if (label.isEmpty()) label = tr("Mark with <%1> variable text").arg(text); - markdata.strtxt = text; + markData.text = text; break; case MARK2ItemType: - insertMDialog->values(label, markdata.itemPtr); - if (markdata.itemPtr == nullptr) + insertMDialog->values(label, markData.itemPtr); + if (markData.itemPtr == nullptr) return false; //FIX ME here user should be warned that inserting of mark fails and why if (label.isEmpty()) - label = tr("Mark to %1 item").arg(markdata.itemPtr->itemName()); - markdata.strtxt = QString::number(markdata.itemPtr->OwnPage +1); + label = tr("Mark to %1 item").arg(markData.itemPtr->itemName()); + markData.text = QString::number(markData.itemPtr->OwnPage +1); break; case MARK2MarkType: //gets pointer to referenced mark - Mark* mrkPtr; - insertMDialog->values(label, mrkPtr); - if (mrkPtr == nullptr) + Mark* markPtr; + insertMDialog->values(label, markPtr); + if (markPtr == nullptr) return false; //FIX ME here user should be warned that inserting of mark fails and why if (label.isEmpty()) - label = tr("Mark to %1 mark").arg(mrkPtr->label); - markdata.strtxt = QString::number(mrkPtr->OwnPage + 1); - markdata.destmarkName = mrkPtr->label; - markdata.destmarkType = mrkPtr->getType(); + label = tr("Mark to %1 mark").arg(markPtr->label); + markData.text = QString::number(markPtr->OwnPage + 1); + markData.destMarkName = markPtr->label; + markData.destMarkType = markPtr->getType(); break; case MARKNoteMasterType: //gets pointer to chosen notes style @@ -9520,7 +9520,7 @@ if (NStyle == nullptr) return false; - markdata.notePtr = doc->newNote(NStyle); + markData.notePtr = doc->newNote(NStyle); label = "NoteMark_" + NStyle->name(); if (NStyle->range() == NSRstory) label += " in " + currItem->firstInChain()->itemName(); @@ -9546,12 +9546,12 @@ else getUniqueName(label, doc->marksLabelsList(mrkType), "_"); mrk = doc->newMark(); - mrk->setValues(label, currItem->OwnPage, mrkType, markdata); + mrk->setValues(label, currItem->OwnPage, mrkType, markData); } else { // that must be variable text mark oldMark = *mrk; - mrk->setString(markdata.strtxt); + mrk->setString(markData.text); mrk->label = label; insertExistedMark = true; doc->flag_updateMarksLabels = true; @@ -9598,9 +9598,8 @@ is->set("strtxt", mrk->getString()); if (mrk->isType(MARK2MarkType)) { - QString dName; - MarkType dType; - mrk->getMark(dName, dType); + QString dName = mrk->getDestMarkName(); + MarkType dType = mrk->getDestMarkType(); is->set("dName", dName); is->set("dType", (int) dType); } @@ -9648,9 +9647,8 @@ case MARK2MarkType: { editMDialog = (MarkInsert*) new Mark2Mark(doc->marksList(), mrk, this); - QString l; - MarkType t; - mrk->getMark(l,t); + QString l = mrk->getDestMarkName(); + MarkType t = mrk->getDestMarkType(); Mark* m = doc->getMark(l,t); editMDialog->setValues(mrk->label, m); } @@ -9697,13 +9695,14 @@ editMDialog->setWindowTitle(tr("Edit %1").arg(editMDialog->windowTitle())); if (editMDialog->exec()) { - Mark oldMark = *mrk; - Mark* Mrk = nullptr; - MarkData markdata; + QString label, text; + QString oldLabel = mrk->label; + MarkData oldData = mrk->getData(); + QString oldStr = mrk->getString(); + Mark* diaMark = nullptr; + MarkData markData; if (currItem != nullptr) - markdata.itemName = currItem->itemName(); - QString label, text; - QString oldStr = mrk->getString(); + markData.itemName = currItem->itemName(); bool newMark = false; bool replaceMark = false; switch (mrk->getType()) @@ -9715,29 +9714,30 @@ label = tr("Anchor mark"); if (mrk->label != label) { - getUniqueName(label,doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed + getUniqueName(label, doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed mrk->label = label; emit UpdateRequest(reqMarksUpdate); } break; case MARKVariableTextType: - Mrk = editMDialog->values(label, text); + diaMark = editMDialog->values(label, text); if (text.isEmpty()) return false; //FIX ME here user should be warned that editing of mark fails and why if (label.isEmpty()) label = tr("Mark with <%1> variable text").arg(text); - if (Mrk != nullptr) + if (diaMark != nullptr) { - if (Mrk != mrk) + if (diaMark != mrk) { - currItem->itemText.replaceMark(currItem->itemText.cursorPosition(), Mrk); - mrk = Mrk; - oldMark = *mrk; + currItem->itemText.replaceMark(currItem->itemText.cursorPosition(), diaMark); + mrk = diaMark; + oldLabel = mrk->label; + oldData = mrk->getData(); replaceMark = true; } if (mrk->label != label) { - getUniqueName(label,doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed + getUniqueName(label, doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed mrk->label = label; emit UpdateRequest(reqMarksUpdate); } @@ -9749,48 +9749,48 @@ } else { - markdata.strtxt = text; + markData.text = text; mrk = doc->newMark(); - getUniqueName(label,doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed - mrk->setValues(label, currItem->OwnPage, MARKVariableTextType, markdata); + getUniqueName(label, doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed + mrk->setValues(label, currItem->OwnPage, MARKVariableTextType, markData); currItem->itemText.replaceMark(currItem->itemText.cursorPosition(), mrk); docWasChanged = true; newMark = true; } break; case MARK2ItemType: - editMDialog->values(label, markdata.itemPtr); - if (markdata.itemPtr == nullptr) + editMDialog->values(label, markData.itemPtr); + if (markData.itemPtr == nullptr) return false; //FIX ME here user should be warned that inserting of mark fails and why if (label.isEmpty()) - label = tr("Mark to %1 item").arg(markdata.itemPtr->itemName()); - if (markdata.itemPtr != mrk->getItemPtr()) + label = tr("Mark to %1 item").arg(markData.itemPtr->itemName()); + if (markData.itemPtr != mrk->getItemPtr()) { - mrk->setItemPtr(markdata.itemPtr); - mrk->setString(doc->getSectionPageNumberForPageIndex(markdata.itemPtr->OwnPage)); + mrk->setItemPtr(markData.itemPtr); + mrk->setString(doc->getSectionPageNumberForPageIndex(markData.itemPtr->OwnPage)); docWasChanged = true; } if (mrk->label != label) { - getUniqueName(label,doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed + getUniqueName(label, doc->marksLabelsList(mrk->getType()), "_"); //FIX ME here user should be warned that inserted mark`s label was changed mrk->label = label; } break; case MARK2MarkType: { //gets pointer to referenced mark - Mark* mrkPtr = nullptr; - editMDialog->values(label, mrkPtr); - if (mrkPtr == nullptr) + Mark* markPtr = nullptr; + editMDialog->values(label, markPtr); + if (markPtr == nullptr) return false; //FIX ME here user should be warned that inserting of mark fails and why if (label.isEmpty()) - label = tr("Mark to %1 mark").arg(mrkPtr->label); - QString destLabel = mrkPtr->label; - MarkType destType = mrkPtr->getType(); - if (markdata.destmarkName != destLabel || markdata.destmarkType != destType) + label = tr("Mark to %1 mark").arg(markPtr->label); + QString destLabel = markPtr->label; + MarkType destType = markPtr->getType(); + if (markData.destMarkName != destLabel || markData.destMarkType != destType) { - mrk->setMark(mrkPtr); - mrk->setString(doc->getSectionPageNumberForPageIndex(mrkPtr->OwnPage)); + mrk->setDestMark(markPtr); + mrk->setString(doc->getSectionPageNumberForPageIndex(markPtr->OwnPage)); docWasChanged = true; } if (mrk->label != label) @@ -9831,9 +9831,8 @@ is->set("MARK", QString("new")); if (mrk->isType(MARK2MarkType)) { - QString dName; - MarkType dType; - mrk->getMark(dName, dType); + QString dName = mrk->getDestMarkName(); + MarkType dType = mrk->getDestMarkType(); is->set("dName", dName); is->set("dType", (int) dType); } @@ -9849,36 +9848,32 @@ is->set("MARK", QString("replace")); else is->set("MARK", QString("edit")); - if (mrk->label != oldMark.label) + if (mrk->label != oldLabel) { - is->set("labelOLD", oldMark.label); + is->set("labelOLD", oldLabel); is->set("labelNEW", mrk->label); doc->flag_updateMarksLabels = true; } - if (mrk->getString() != oldMark.getString()) + if (mrk->getString() != oldData.text) { - is->set("strtxtOLD", oldMark.getString()); + is->set("strtxtOLD", oldData.text); is->set("strtxtNEW", mrk->getString()); } if (mrk->isType(MARK2MarkType)) { - QString dNameOLD; - MarkType dTypeOLD; - oldMark.getMark(dNameOLD, dTypeOLD); - QString dName; - MarkType dType; - mrk->getMark(dName, dType); - if (dName != dNameOLD || dType != dTypeOLD) + QString dName = mrk->getDestMarkName(); + MarkType dType = mrk->getDestMarkType(); + if (dName != oldData.destMarkName || dType != oldData.destMarkType) { - is->set("dNameOLD", dNameOLD); - is->set("dTypeOLD", (int) dTypeOLD); + is->set("dNameOLD", oldData.destMarkName); + is->set("dTypeOLD", (int) oldData.destMarkType); is->set("dNameNEW", dName); is->set("dTypeNEW", (int) dType); } } - if (mrk->isType(MARK2ItemType) && mrk->getItemPtr() != oldMark.getItemPtr()) + if (mrk->isType(MARK2ItemType) && mrk->getItemPtr() != oldData.itemPtr) { - is->insertItem("itemPtrOLD", oldMark.getItemPtr()); + is->insertItem("itemPtrOLD", oldData.itemPtr); is->insertItem("itemPtrNEW", mrk->getItemPtr()); } } Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24644&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Mon May 10 21:47:39 2021 @@ -1964,7 +1964,7 @@ invalidateVariableTextFrames(mrk, false); } if (is->contains("dNameOLD")) - mrk->setMark(is->get("dNameOLD"), (MarkType) is->getInt("dTypeOLD")); + mrk->setDestMark(is->get("dNameOLD"), (MarkType) is->getInt("dTypeOLD")); if (is->getItem("itemPtrOLD") != nullptr) mrk->setItemPtr((PageItem*) is->getItem("itemPtrOLD")); } @@ -1996,7 +1996,7 @@ invalidateVariableTextFrames(mrk, false); } if (is->contains("dName")) - mrk->setMark(is->get("dName"), (MarkType) is->getInt("dType")); + mrk->setDestMark(is->get("dName"), (MarkType) is->getInt("dType")); if (is->getItem("itemPtr") != nullptr) mrk->setItemPtr((PageItem*) is->getItem("itemPtr")); } @@ -2050,7 +2050,7 @@ if (is->contains("strtxt")) mrk->setString(is->get("strtxt")); if (is->contains("dName")) - mrk->setMark(is->get("dName"), (MarkType) is->getInt("dType")); + mrk->setDestMark(is->get("dName"), (MarkType) is->getInt("dType")); if (is->getItem("itemPtr") != nullptr) mrk->setItemPtr((PageItem*) is->getItem("itemPtr")); if (mrk->isType(MARKNoteMasterType)) @@ -2087,7 +2087,7 @@ invalidateVariableTextFrames(mrk, false); } if (is->contains("dNameNEW")) - mrk->setMark(is->get("dNameNEW"), (MarkType) is->getInt("dTypeNEW")); + mrk->setDestMark(is->get("dNameNEW"), (MarkType) is->getInt("dTypeNEW")); if (is->getItem("itemPtrNEW") != nullptr) mrk->setItemPtr((PageItem*) is->getItem("itemPtrNEW")); } @@ -17005,9 +17005,8 @@ continue; if (m->isType(MARK2MarkType)) { - QString l; - MarkType t; - m->getMark(l, t); + QString l = m->getDestMarkName(); + MarkType t = m->getDestMarkType(); if (mrk == getMark(l, t)) { setUndoDelMark(m); @@ -17042,9 +17041,8 @@ ims->set("at", findMarkCPos(mrk, master)); if (mrk->isType(MARK2MarkType)) { - QString dName; - MarkType dType; - mrk->getMark(dName, dType); + QString dName = mrk->getDestMarkName(); + MarkType dType = mrk->getDestMarkType(); ims->set("dName", dName); ims->set("dType", (int) dType); } @@ -17200,9 +17198,8 @@ } else if (mrk->isType(MARK2MarkType)) { - QString l; - MarkType t; - mrk->getMark(l, t); + QString l = mrk->getDestMarkName(); + MarkType t = mrk->getDestMarkType(); Mark* destMark = getMark(l, t); if (destMark != nullptr) { Modified: trunk/Scribus/scribus/text/storytext.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24644&path=/trunk/Scribus/scribus/text/storytext.cpp ============================================================================== --- trunk/Scribus/scribus/text/storytext.cpp (original) +++ trunk/Scribus/scribus/text/storytext.cpp Mon May 10 21:47:39 2021 @@ -2278,10 +2278,9 @@ mark_attr.insert("item", mrk->getItemPtr()->itemName()); else if (mrk->isType(MARK2MarkType)) { - QString l; - MarkType t; - mrk->getMark(l, t); - if (m_doc->getMark(l,t) != nullptr) + QString l = mrk->getDestMarkName(); + MarkType t = mrk->getDestMarkType(); + if (m_doc->getMark(l, t) != nullptr) { mark_attr.insert("mark_l", l); mark_attr.insert("mark_t", QString::number((int) t)); @@ -2560,7 +2559,7 @@ if (mrk->isType(MARK2MarkType) && (m_lIt != attr.end()) && (m_tIt != attr.end())) { Mark* targetMark = doc->getMark(Xml_data(m_lIt), (MarkType) parseInt(Xml_data(m_tIt))); - mrk->setMark(targetMark); + mrk->setDestMark(targetMark); if (targetMark == nullptr) mrk->setString("0"); else From scribus-commit at lists.scribus.net Tue May 11 18:28:40 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 11 May 2021 18:28:40 -0000 Subject: r24645 by jghali - Code style fixes Message-ID: Author: jghali Date: Tue May 11 18:28:39 2021 New Revision: 24645 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24645 Log: Code style fixes Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24645&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp Tue May 11 18:28:39 2021 @@ -204,7 +204,7 @@ { s = (QRgb*)(m_imageInfoRecord.exifInfo.thumbnail.scanLine( yit )); d = r_image.scanLine( yit ); - for (int xit =0 ; xit < m_imageInfoRecord.exifInfo.thumbnail.width(); ++xit) + for (int xit = 0; xit < m_imageInfoRecord.exifInfo.thumbnail.width(); ++xit) { if (isCMYK) { Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24645&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp Tue May 11 18:28:39 2021 @@ -283,7 +283,7 @@ if (yt > (uint) image->height()) break; if (image->height()-yt < rows) - tileH = image->height()-yt; + tileH = image->height() - yt; tileW = columns; uint32_t yi; int chans = image->channels(); @@ -292,7 +292,7 @@ TIFFReadTile(tif, tile_buf, xt, yt, 0, 0); for (yi = 0; yi < tileH; yi++) { - _TIFFmemcpy(image->scanLine(yt+(tileH-1-yi))+xt, tile_buf+tileW*yi, tileW*chans); + _TIFFmemcpy(image->scanLine(yt + (tileH - 1 - yi)) + xt, tile_buf + tileW * yi, tileW * chans); } } } From scribus-commit at lists.scribus.net Sun May 16 13:33:19 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 16 May 2021 13:33:19 -0000 Subject: r24646 by jghali - Code style fixes Message-ID: Author: jghali Date: Sun May 16 13:33:19 2021 New Revision: 24646 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24646 Log: Code style fixes Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24646&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp Sun May 16 13:33:19 2021 @@ -458,19 +458,19 @@ } else if (layBlend == "scrn") { - src_r = 255 - ((255-src_r) * (255-d[0]) / 128); - src_g = 255 - ((255-src_g) * (255-d[1]) / 128); - src_b = 255 - ((255-src_b) * (255-d[2]) / 128); + src_r = 255 - ((255 - src_r) * (255 - d[0]) / 128); + src_g = 255 - ((255 - src_g) * (255 - d[1]) / 128); + src_b = 255 - ((255 - src_b) * (255 - d[2]) / 128); if (cmyk) - src_a = 255 - ((255-src_a) * (255-d[3]) / 128); + src_a = 255 - ((255 - src_a) * (255 - d[3]) / 128); } else if (layBlend == "over") { - src_r = d[0] < 128 ? src_r * d[0] / 128 : 255 - ((255-src_r) * (255-d[0]) / 128); - src_g = d[1] < 128 ? src_g * d[1] / 128 : 255 - ((255-src_g) * (255-d[1]) / 128); - src_b = d[2] < 128 ? src_b * d[2] / 128 : 255 - ((255-src_b) * (255-d[2]) / 128); + src_r = d[0] < 128 ? src_r * d[0] / 128 : 255 - ((255 - src_r) * (255 - d[0]) / 128); + src_g = d[1] < 128 ? src_g * d[1] / 128 : 255 - ((255 - src_g) * (255 - d[1]) / 128); + src_b = d[2] < 128 ? src_b * d[2] / 128 : 255 - ((255 - src_b) * (255 - d[2]) / 128); if (cmyk) - src_a = d[3] < 128 ? src_a * d[3] / 128 : 255 - ((255-src_a) * (255-d[3]) / 128); + src_a = d[3] < 128 ? src_a * d[3] / 128 : 255 - ((255 - src_a) * (255 - d[3]) / 128); } else if (layBlend == "diff") { @@ -490,19 +490,19 @@ } else if (layBlend == "hLit") { - src_r = src_r < 128 ? src_r * d[0] / 128 : 255 - ((255-src_r) * (255-d[0]) / 128); - src_g = src_g < 128 ? src_g * d[1] / 128 : 255 - ((255-src_g) * (255-d[1]) / 128); - src_b = src_b < 128 ? src_b * d[2] / 128 : 255 - ((255-src_b) * (255-d[2]) / 128); + src_r = src_r < 128 ? src_r * d[0] / 128 : 255 - ((255 - src_r) * (255 - d[0]) / 128); + src_g = src_g < 128 ? src_g * d[1] / 128 : 255 - ((255 - src_g) * (255 - d[1]) / 128); + src_b = src_b < 128 ? src_b * d[2] / 128 : 255 - ((255 - src_b) * (255 - d[2]) / 128); if (cmyk) - src_a = src_a < 128 ? src_a * d[3] / 128 : 255 - ((255-src_a) * (255-d[3]) / 128); + src_a = src_a < 128 ? src_a * d[3] / 128 : 255 - ((255 - src_a) * (255 - d[3]) / 128); } else if (layBlend == "sLit") { - src_r = src_r * d[0] / 256 + src_r * (255 - ((255-src_r)*(255-d[0]) / 256) - src_r * d[0] / 256) / 256; - src_g = src_g * d[1] / 256 + src_g * (255 - ((255-src_g)*(255-d[1]) / 256) - src_g * d[1] / 256) / 256; - src_b = src_b * d[2] / 256 + src_b * (255 - ((255-src_b)*(255-d[2]) / 256) - src_b * d[2] / 256) / 256; + src_r = src_r * d[0] / 256 + src_r * (255 - ((255 - src_r)*(255 - d[0]) / 256) - src_r * d[0] / 256) / 256; + src_g = src_g * d[1] / 256 + src_g * (255 - ((255 - src_g)*(255 - d[1]) / 256) - src_g * d[1] / 256) / 256; + src_b = src_b * d[2] / 256 + src_b * (255 - ((255 - src_b)*(255 - d[2]) / 256) - src_b * d[2] / 256) / 256; if (cmyk) - src_a = src_a * d[3] / 256 + src_a * (255 - ((255-src_a)*(255-d[3]) / 256) - src_a * d[3] / 256) / 256; + src_a = src_a * d[3] / 256 + src_a * (255 - ((255 - src_a)*(255 - d[3]) / 256) - src_a * d[3] / 256) / 256; } else if (layBlend == "lite") { @@ -522,19 +522,19 @@ } else if (layBlend == "div ") { - src_r = src_r == 255 ? 255 : ((d[0] * 256) / (255-src_r)) > 255 ? 255 : (d[0] * 256) / (255-src_r); - src_g = src_g == 255 ? 255 : ((d[1] * 256) / (255-src_g)) > 255 ? 255 : (d[1] * 256) / (255-src_g); - src_b = src_b == 255 ? 255 : ((d[2] * 256) / (255-src_b)) > 255 ? 255 : (d[2] * 256) / (255-src_b); + src_r = src_r == 255 ? 255 : ((d[0] * 256) / (255 - src_r)) > 255 ? 255 : (d[0] * 256) / (255 - src_r); + src_g = src_g == 255 ? 255 : ((d[1] * 256) / (255 - src_g)) > 255 ? 255 : (d[1] * 256) / (255 - src_g); + src_b = src_b == 255 ? 255 : ((d[2] * 256) / (255 - src_b)) > 255 ? 255 : (d[2] * 256) / (255 - src_b); if (cmyk) - src_a = src_a == 255 ? 255 : ((d[3] * 256) / (255-src_a)) > 255 ? 255 : (d[3] * 256) / (255-src_a); + src_a = src_a == 255 ? 255 : ((d[3] * 256) / (255 - src_a)) > 255 ? 255 : (d[3] * 256) / (255 - src_a); } else if (layBlend == "idiv") { - src_r = src_r == 0 ? 0 : (255 - (((255-d[0]) * 256) / src_r)) < 0 ? 0 : 255 - (((255-d[0]) * 256) / src_r); - src_g = src_g == 0 ? 0 : (255 - (((255-d[1]) * 256) / src_g)) < 0 ? 0 : 255 - (((255-d[1]) * 256) / src_g); - src_b = src_b == 0 ? 0 : (255 - (((255-d[2]) * 256) / src_b)) < 0 ? 0 : 255 - (((255-d[2]) * 256) / src_b); + src_r = src_r == 0 ? 0 : (255 - (((255 - d[0]) * 256) / src_r)) < 0 ? 0 : 255 - (((255 - d[0]) * 256) / src_r); + src_g = src_g == 0 ? 0 : (255 - (((255 - d[1]) * 256) / src_g)) < 0 ? 0 : 255 - (((255 - d[1]) * 256) / src_g); + src_b = src_b == 0 ? 0 : (255 - (((255 - d[2]) * 256) / src_b)) < 0 ? 0 : 255 - (((255 - d[2]) * 256) / src_b); if (cmyk) - src_a = src_a == 0 ? 0 : (255 - (((255-d[3]) * 256) / src_a)) < 0 ? 0 : 255 - (((255-d[3]) * 256) / src_a); + src_a = src_a == 0 ? 0 : (255 - (((255 - d[3]) * 256) / src_a)) < 0 ? 0 : 255 - (((255 - d[3]) * 256) / src_a); } else if (layBlend == "hue ") { @@ -1608,19 +1608,19 @@ } else if (layBlend == "scrn") { - src_r = 255 - ((255-src_r) * (255-d[0]) / 128); - src_g = 255 - ((255-src_g) * (255-d[1]) / 128); - src_b = 255 - ((255-src_b) * (255-d[2]) / 128); + src_r = 255 - ((255 - src_r) * (255 - d[0]) / 128); + src_g = 255 - ((255 - src_g) * (255 - d[1]) / 128); + src_b = 255 - ((255 - src_b) * (255 - d[2]) / 128); if (header.color_mode == CM_CMYK) - src_a = 255 - ((255-src_a) * (255-d[3]) / 128); + src_a = 255 - ((255 - src_a) * (255 - d[3]) / 128); } else if (layBlend == "over") { - src_g = d[1] < 128 ? src_g * d[1] / 128 : 255 - ((255-src_g) * (255-d[1]) / 128); - src_b = d[2] < 128 ? src_b * d[2] / 128 : 255 - ((255-src_b) * (255-d[2]) / 128); - src_a = d[3] < 128 ? src_a * d[3] / 128 : 255 - ((255-src_a) * (255-d[3]) / 128); + src_g = d[1] < 128 ? src_g * d[1] / 128 : 255 - ((255 - src_g) * (255 - d[1]) / 128); + src_b = d[2] < 128 ? src_b * d[2] / 128 : 255 - ((255 - src_b) * (255 - d[2]) / 128); + src_a = d[3] < 128 ? src_a * d[3] / 128 : 255 - ((255 - src_a) * (255 - d[3]) / 128); if (header.color_mode == CM_CMYK) - src_r = d[0] < 128 ? src_r * d[0] / 128 : 255 - ((255-src_r) * (255-d[0]) / 128); + src_r = d[0] < 128 ? src_r * d[0] / 128 : 255 - ((255 - src_r) * (255 - d[0]) / 128); } else if (layBlend == "diff") { @@ -1640,19 +1640,19 @@ } else if (layBlend == "hLit") { - src_r = src_r < 128 ? src_r * d[0] / 128 : 255 - ((255-src_r) * (255-d[0]) / 128); - src_g = src_g < 128 ? src_g * d[1] / 128 : 255 - ((255-src_g) * (255-d[1]) / 128); - src_b = src_b < 128 ? src_b * d[2] / 128 : 255 - ((255-src_b) * (255-d[2]) / 128); + src_r = src_r < 128 ? src_r * d[0] / 128 : 255 - ((255 - src_r) * (255 - d[0]) / 128); + src_g = src_g < 128 ? src_g * d[1] / 128 : 255 - ((255 - src_g) * (255 - d[1]) / 128); + src_b = src_b < 128 ? src_b * d[2] / 128 : 255 - ((255 - src_b) * (255 - d[2]) / 128); if (header.color_mode == CM_CMYK) - src_a = src_a < 128 ? src_a * d[3] / 128 : 255 - ((255-src_a) * (255-d[3]) / 128); + src_a = src_a < 128 ? src_a * d[3] / 128 : 255 - ((255 - src_a) * (255 - d[3]) / 128); } else if (layBlend == "sLit") { - src_r = src_r * d[0] / 256 + src_r * (255 - ((255-src_r)*(255-d[0]) / 256) - src_r * d[0] / 256) / 256; - src_g = src_g * d[1] / 256 + src_g * (255 - ((255-src_g)*(255-d[1]) / 256) - src_g * d[1] / 256) / 256; - src_b = src_b * d[2] / 256 + src_b * (255 - ((255-src_b)*(255-d[2]) / 256) - src_b * d[2] / 256) / 256; + src_r = src_r * d[0] / 256 + src_r * (255 - ((255 - src_r)*(255 - d[0]) / 256) - src_r * d[0] / 256) / 256; + src_g = src_g * d[1] / 256 + src_g * (255 - ((255 - src_g)*(255 - d[1]) / 256) - src_g * d[1] / 256) / 256; + src_b = src_b * d[2] / 256 + src_b * (255 - ((255 - src_b)*(255 - d[2]) / 256) - src_b * d[2] / 256) / 256; if (header.color_mode == CM_CMYK) - src_a = src_a * d[3] / 256 + src_a * (255 - ((255-src_a)*(255-d[3]) / 256) - src_a * d[3] / 256) / 256; + src_a = src_a * d[3] / 256 + src_a * (255 - ((255 - src_a)*(255 - d[3]) / 256) - src_a * d[3] / 256) / 256; } else if (layBlend == "lite") { @@ -1672,19 +1672,19 @@ } else if (layBlend == "div ") { - src_r = src_r == 255 ? 255 : ((d[0] * 256) / (255-src_r)) > 255 ? 255 : (d[0] * 256) / (255-src_r); - src_g = src_g == 255 ? 255 : ((d[1] * 256) / (255-src_g)) > 255 ? 255 : (d[1] * 256) / (255-src_g); - src_b = src_b == 255 ? 255 : ((d[2] * 256) / (255-src_b)) > 255 ? 255 : (d[2] * 256) / (255-src_b); + src_r = src_r == 255 ? 255 : ((d[0] * 256) / (255 - src_r)) > 255 ? 255 : (d[0] * 256) / (255 - src_r); + src_g = src_g == 255 ? 255 : ((d[1] * 256) / (255 - src_g)) > 255 ? 255 : (d[1] * 256) / (255 - src_g); + src_b = src_b == 255 ? 255 : ((d[2] * 256) / (255 - src_b)) > 255 ? 255 : (d[2] * 256) / (255 - src_b); if (header.color_mode == CM_CMYK) - src_a = src_a == 255 ? 255 : ((d[3] * 256) / (255-src_a)) > 255 ? 255 : (d[3] * 256) / (255-src_a); + src_a = src_a == 255 ? 255 : ((d[3] * 256) / (255 - src_a)) > 255 ? 255 : (d[3] * 256) / (255 - src_a); } else if (layBlend == "idiv") { - src_r = src_r == 0 ? 0 : (255 - (((255-d[0]) * 256) / src_r)) < 0 ? 0 : 255 - (((255-d[0]) * 256) / src_r); - src_g = src_g == 0 ? 0 : (255 - (((255-d[1]) * 256) / src_g)) < 0 ? 0 : 255 - (((255-d[1]) * 256) / src_g); - src_b = src_b == 0 ? 0 : (255 - (((255-d[2]) * 256) / src_b)) < 0 ? 0 : 255 - (((255-d[2]) * 256) / src_b); + src_r = src_r == 0 ? 0 : (255 - (((255 - d[0]) * 256) / src_r)) < 0 ? 0 : 255 - (((255 - d[0]) * 256) / src_r); + src_g = src_g == 0 ? 0 : (255 - (((255 - d[1]) * 256) / src_g)) < 0 ? 0 : 255 - (((255 - d[1]) * 256) / src_g); + src_b = src_b == 0 ? 0 : (255 - (((255 - d[2]) * 256) / src_b)) < 0 ? 0 : 255 - (((255 - d[2]) * 256) / src_b); if (header.color_mode == CM_CMYK) - src_a = src_a == 0 ? 0 : (255 - (((255-d[3]) * 256) / src_a)) < 0 ? 0 : 255 - (((255-d[3]) * 256) / src_a); + src_a = src_a == 0 ? 0 : (255 - (((255 - d[3]) * 256) / src_a)) < 0 ? 0 : 255 - (((255 - d[3]) * 256) / src_a); } else if (layBlend == "hue ") { From scribus-commit at lists.scribus.net Sun May 23 20:15:03 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 23 May 2021 20:15:03 -0000 Subject: r24647 by jghali - #13132: 16bit CMYK tiff image does not show correctly in scribus (and doesn't report why) Message-ID: Author: jghali Date: Sun May 23 20:15:03 2021 New Revision: 24647 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24647 Log: #13132: 16bit CMYK tiff image does not show correctly in scribus (and doesn't report why) Added: trunk/Scribus/scribus/util_image.h Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp Sun May 23 20:15:03 2021 @@ -14,6 +14,7 @@ #include "scimgdataloader_tiff.h" #include "scribuscore.h" #include "util_color.h" +#include "util_image.h" static void TagExtender(TIFF *tiff) { @@ -27,7 +28,7 @@ ScImgDataLoader_TIFF::ScImgDataLoader_TIFF() { m_photometric = PHOTOMETRIC_MINISBLACK; - m_samplesperpixel = 72; + m_samplesPerPixel = 72; initSupportedFormatList(); } @@ -248,118 +249,115 @@ } } -bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t photometric, uint16_t bitspersample, uint16_t samplesperpixel, bool &bilevel, bool &isCMYK) +bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, const SampleFormatInfo& sampleInfo, bool &bilevel, bool &isCMYK) { - uint32_t *bits = nullptr; - if (photometric == PHOTOMETRIC_SEPARATED) - { - if (samplesperpixel > 5) - { - if (!getImageData_RGBA(tif, image, widtht, heightt, size, bitspersample, samplesperpixel)) - return false; - if (bitspersample == 1) - bilevel = true; - isCMYK = false; - m_pixelFormat = Format_RGBA_8; - } - else - { - if (TIFFIsTiled(tif)) - { - uint32_t columns, rows; - uint32_t *tile_buf; - uint32_t xt, yt; - TIFFGetField(tif, TIFFTAG_TILEWIDTH, &columns); - TIFFGetField(tif, TIFFTAG_TILELENGTH, &rows); - tile_buf = (uint32_t*) _TIFFmalloc(columns * rows * sizeof(uint32_t)); - if (tile_buf == nullptr) - { - TIFFClose(tif); - return false; - } - uint32_t tileW = columns, tileH = rows; - for (yt = 0; yt < (uint32_t) image->height(); yt += rows) - { - if (yt > (uint) image->height()) - break; - if (image->height()-yt < rows) - tileH = image->height() - yt; - tileW = columns; - uint32_t yi; - int chans = image->channels(); - for (xt = 0; xt < (uint) image->width(); xt += columns) - { - TIFFReadTile(tif, tile_buf, xt, yt, 0, 0); - for (yi = 0; yi < tileH; yi++) - { - _TIFFmemcpy(image->scanLine(yt + (tileH - 1 - yi)) + xt, tile_buf + tileW * yi, tileW * chans); - } - } - } - _TIFFfree(tile_buf); - } - else - { - tsize_t bytesperrow = TIFFScanlineSize(tif); - bits = (uint32_t *) _TIFFmalloc(bytesperrow); - int chans = image->channels(); - if (bits) - { - for (unsigned int y = 0; y < heightt; y++) - { - if (TIFFReadScanline(tif, bits, y, 0)) - { - /* The code below allows loading of CMYK TIFFs generated by ImageMagick, - currently commented out because its an ugly hack atm - When converting 8-bit PNGs with an alpha channel to CMYK Tiff, ImageMagick - creates a 16-bit CMYK Tiff !?!?? - if (bitspersample > 8) - { - uchar *ptrT = image->scanLine(y); - uchar *ptrS = (uchar*)bits; - for (unsigned int x = 0; x < widtht; x++) - { - ptrT[0] = ptrS[1]; - ptrT[1] = ptrS[3]; - ptrT[2] = ptrS[5]; - ptrT[3] = ptrS[7]; - if (samplesperpixel > 4) - ptrT[4] = ptrS[9]; - ptrT += chans; - ptrS += chans * 2; - } - } - else */ - memcpy(image->scanLine(y), bits, chans * widtht); - } - } - _TIFFfree(bits); - } - } - isCMYK = true; - m_pixelFormat = (image->channels() == 5) ? Format_CMYKA_8 : Format_CMYK_8; - } - } - else - { - if (!getImageData_RGBA(tif, image, widtht, heightt, size, bitspersample, samplesperpixel)) + if (sampleInfo.photometric != PHOTOMETRIC_SEPARATED) + { + if (!getImageData_RGBA(tif, image, widtht, heightt, size, sampleInfo)) return false; - if (bitspersample == 1) + if (sampleInfo.bitsPerSample == 1) bilevel = true; m_pixelFormat = Format_RGBA_8; - } + return true; + } + + // Now we are in the PHOTOMETRIC_SEPARATED case + if (sampleInfo.samplesPerPixel > 5) + { + if (!getImageData_RGBA(tif, image, widtht, heightt, size, sampleInfo)) + return false; + if (sampleInfo.bitsPerSample == 1) + bilevel = true; + isCMYK = false; + m_pixelFormat = Format_RGBA_8; + return true; + } + + if (sampleInfo.samplesFormat != SAMPLEFORMAT_UINT && sampleInfo.samplesFormat != SAMPLEFORMAT_INT) + { + m_message = QObject::tr("This image uses an unsupported non integer sample format"); + m_msgType = errorMsg; + return false; + } + + if (sampleInfo.bitsPerSample > 16) + { + m_message = QObject::tr("This image uses an unsupported bit depth: %1 bits per sample.").arg(sampleInfo.bitsPerSample); + m_msgType = errorMsg; + return false; + } + + if (TIFFIsTiled(tif)) + { + uint32_t columns, rows; + uint32_t *tile_buf; + uint32_t xt, yt; + TIFFGetField(tif, TIFFTAG_TILEWIDTH, &columns); + TIFFGetField(tif, TIFFTAG_TILELENGTH, &rows); + tile_buf = (uint32_t*) _TIFFmalloc(columns * rows * sizeof(uint32_t)); + if (tile_buf == nullptr) + { + TIFFClose(tif); + return false; + } + uint32_t tileW = columns, tileH = rows; + for (yt = 0; yt < (uint32_t) image->height(); yt += rows) + { + if (yt > (uint) image->height()) + break; + if (image->height() - yt < rows) + tileH = image->height() - yt; + tileW = columns; + uint32_t yi; + int chans = image->channels(); + for (xt = 0; xt < (uint) image->width(); xt += columns) + { + TIFFReadTile(tif, tile_buf, xt, yt, 0, 0); + for (yi = 0; yi < tileH; yi++) + { + _TIFFmemcpy(image->scanLine(yt + (tileH - 1 - yi)) + xt, tile_buf + tileW * yi, tileW * chans); + } + } + } + _TIFFfree(tile_buf); + } + else + { + int chans = image->channels(); + tsize_t bytesperrow = TIFFScanlineSize(tif); + uint32_t *bits = (uint32_t *) _TIFFmalloc(bytesperrow); + if (bits) + { + for (unsigned int y = 0; y < heightt; y++) + { + if (!TIFFReadScanline(tif, bits, y, 0)) + break; + + if (sampleInfo.bitsPerSample == 16 && sampleInfo.samplesFormat == SAMPLEFORMAT_UINT) + convertImageData((uint16_t*) bits, (uint8_t*) image->scanLine(y), chans * widtht); + else if (sampleInfo.bitsPerSample == 16 && sampleInfo.samplesFormat == SAMPLEFORMAT_INT) + convertImageData((int16_t*) bits, (uint8_t*) image->scanLine(y), chans * widtht); + else + memcpy(image->scanLine(y), bits, chans * widtht); + } + _TIFFfree(bits); + } + } + isCMYK = true; + m_pixelFormat = (image->channels() == 5) ? Format_CMYKA_8 : Format_CMYK_8; + return true; } -bool ScImgDataLoader_TIFF::getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t bitspersample, uint16_t samplesperpixel) +bool ScImgDataLoader_TIFF::getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, const SampleFormatInfo& sampleInfo) { uint32_t* bits = (uint32_t *) _TIFFmalloc(size * sizeof(uint32_t)); if (!bits) return false; - uint16_t extrasamples(0), *extratypes(nullptr); - if (!TIFFGetField (tif, TIFFTAG_EXTRASAMPLES, &extrasamples, &extratypes)) - extrasamples = 0; + uint16_t extraSamples(0), *extraTypes(nullptr); + if (!TIFFGetField (tif, TIFFTAG_EXTRASAMPLES, &extraSamples, &extraTypes)) + extraSamples = 0; bool gotData = false; if (TIFFReadRGBAImage(tif, widtht, heightt, bits, 0)) @@ -369,7 +367,7 @@ memcpy(image->scanLine(heightt - 1 - y), bits + y * widtht, widtht * image->channels()); if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { - unsigned char *s = image->scanLine( heightt - 1 - y ); + unsigned char *s = image->scanLine(heightt - 1 - y); unsigned char r, g, b, a; for (uint xi = 0; xi < widtht; ++xi) { @@ -385,7 +383,7 @@ } } } - if (extrasamples > 0 && extratypes[0] == EXTRASAMPLE_ASSOCALPHA) + if (extraSamples > 0 && extraTypes[0] == EXTRASAMPLE_ASSOCALPHA) unmultiplyRGBA(image); gotData = true; } @@ -652,7 +650,7 @@ bool bilevel = false; bool failedPS = false; bool foundPS = false; - short resolutionunit = RESUNIT_INCH; // Default unit is inch + short resolutionUnit = RESUNIT_INCH; // Default unit is inch float xres = 72.0, yres = 72.0; if (!QFile::exists(fn)) return false; @@ -693,18 +691,22 @@ bool isCMYK = false; unsigned int widtht, heightt, size; char *description=nullptr, *copyright=nullptr, *datetime=nullptr, *artist=nullptr, *scannerMake=nullptr, *scannerModel=nullptr; - uint16_t bitspersample, fillorder, planar; + uint16_t bitsPerSample = 1; + uint16_t sampleFormat = SAMPLEFORMAT_UINT; + uint16_t fillorder = FILLORDER_MSB2LSB; + uint16_t planar = PLANARCONFIG_CONTIG; TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &widtht); TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &heightt); TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres); TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); - TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT , &resolutionunit); + TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT , &resolutionUnit); size = widtht * heightt; TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &m_photometric); TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &planar); - TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bitspersample); - TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &m_samplesperpixel); + TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bitsPerSample); + TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &m_samplesPerPixel); + TIFFGetField(tif, TIFFTAG_SAMPLEFORMAT, &sampleFormat); TIFFGetField(tif, TIFFTAG_FILLORDER, &fillorder); TIFFGetField(tif, TIFFTAG_MAKE, &scannerMake); @@ -713,6 +715,14 @@ TIFFGetField(tif, TIFFTAG_COPYRIGHT, ©right); TIFFGetField(tif, TIFFTAG_DATETIME, &datetime); TIFFGetField(tif, TIFFTAG_ARTIST, &artist); + + SampleFormatInfo sampleInfo; + sampleInfo.photometric = m_photometric; + sampleInfo.bitsPerSample = bitsPerSample; + sampleInfo.samplesPerPixel = m_samplesPerPixel; + sampleInfo.samplesFormat = sampleFormat; + sampleInfo.fillOrder = fillorder; + m_imageInfoRecord.exifInfo.cameraName = QString(scannerModel); m_imageInfoRecord.exifInfo.cameraVendor = QString(scannerMake); m_imageInfoRecord.exifInfo.comment = QString(description); @@ -764,14 +774,14 @@ isCMYK = true; m_imageInfoRecord.colorspace = ColorSpaceCMYK; } - else if (m_samplesperpixel == 1) + else if (m_samplesPerPixel == 1) { m_imageInfoRecord.colorspace = ColorSpaceGray; isCMYK = false; } else m_imageInfoRecord.colorspace = ColorSpaceRGB; - if (bitspersample == 1) + if (bitsPerSample == 1) bilevel = true; if (!m_imageInfoRecord.exifInfo.thumbnail.isNull()) { @@ -855,7 +865,7 @@ fakeHeader.color_mode = CM_CMYK; chans = 5; } - else if (m_samplesperpixel == 1) + else if (m_samplesPerPixel == 1) { fakeHeader.color_mode = CM_GRAYSCALE; isCMYK = false; @@ -900,10 +910,10 @@ int chans = 4; if (m_photometric == PHOTOMETRIC_SEPARATED) { - if (m_samplesperpixel > 5) + if (m_samplesPerPixel > 5) chans = 4; else - chans = m_samplesperpixel; + chans = m_samplesPerPixel; } else chans = 4; @@ -924,7 +934,7 @@ } tmpImg.fill(0); - if (!getImageData(tif, &tmpImg, widtht, heightt, size, m_photometric, bitspersample, m_samplesperpixel, bilevel, isCMYK)) + if (!getImageData(tif, &tmpImg, widtht, heightt, size, sampleInfo, bilevel, isCMYK)) { TIFFClose(tif); return false; @@ -987,14 +997,14 @@ while (test == 1); TIFFClose(tif); } - if (resolutionunit == RESUNIT_INCH) + if (resolutionUnit == RESUNIT_INCH) { m_image.setDotsPerMeterX ((int) (xres / 0.0254)); m_image.setDotsPerMeterY ((int) (yres / 0.0254)); m_imageInfoRecord.xres = qRound(xres); m_imageInfoRecord.yres = qRound(yres); } - else if (resolutionunit == RESUNIT_CENTIMETER) + else if (resolutionUnit == RESUNIT_CENTIMETER) { m_image.setDotsPerMeterX ((int) (xres * 100.0)); m_image.setDotsPerMeterY ((int) (yres * 100.0)); @@ -1006,10 +1016,10 @@ m_imageInfoRecord.colorspace = ColorSpaceCMYK; m_pixelFormat = (r_image.channels() == 5) ? Format_CMYKA_8 : Format_CMYK_8; } - else if (m_samplesperpixel == 1) + else if (m_samplesPerPixel == 1) { // Do not set m_pixelFormat here as the real pixel format is most probably different than gray - if (bitspersample == 1) + if (bitsPerSample == 1) m_imageInfoRecord.colorspace = ColorSpaceMonochrome; else m_imageInfoRecord.colorspace = ColorSpaceGray; Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h ============================================================================== --- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h (original) +++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.h Sun May 23 20:15:03 2021 @@ -10,9 +10,9 @@ #include #include +#include + #include "scimgdataloader.h" -//Added by qt3to4: -#include class ScImgDataLoader_TIFF : public ScImgDataLoader { @@ -39,10 +39,20 @@ CM_DUOTONE = 8, CM_LABCOLOR = 9 }; + + struct SampleFormatInfo + { + uint16_t photometric; + uint16_t bitsPerSample; + uint16_t samplesPerPixel; + uint16_t samplesFormat; + uint16_t fillOrder; + }; + void initSupportedFormatList(); int getLayers(const QString& fn, int page); - bool getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t m_photometric, uint16_t bitspersample, uint16_t m_samplesperpixel, bool &bilevel, bool &isCMYK); - bool getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, uint16_t bitspersample, uint16_t m_samplesperpixel); + bool getImageData(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, const SampleFormatInfo& sampleInfo, bool &bilevel, bool &isCMYK); + bool getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, const SampleFormatInfo& sampleInfo); void blendOntoTarget(RawImage *tmp, int layOpa, const QString& layBlend, bool cmyk, bool useMask); QString getLayerString(QDataStream & s); bool loadChannel( QDataStream & s, const PSDHeader & header, QList &layerInfo, uint layer, int channel, int component, RawImage &tmpImg); @@ -53,7 +63,8 @@ void unmultiplyRGBA(RawImage *image); int m_random_table[4096]; - uint16_t m_photometric, m_samplesperpixel; + uint16_t m_photometric; + uint16_t m_samplesPerPixel; }; #endif Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj (original) +++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj Sun May 23 20:15:03 2021 @@ -819,6 +819,7 @@ + Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters ============================================================================== --- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters (original) +++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters Sun May 23 20:15:03 2021 @@ -548,6 +548,9 @@ Header Files + + Header Files + Header Files Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj (original) +++ trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj Sun May 23 20:15:03 2021 @@ -819,6 +819,7 @@ + Modified: trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters ============================================================================== --- trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters (original) +++ trunk/Scribus/win32/msvc2017/scribus-main/Scribus.vcxproj.filters Sun May 23 20:15:03 2021 @@ -548,6 +548,9 @@ Header Files + + Header Files + Header Files Modified: trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj (original) +++ trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj Sun May 23 20:15:03 2021 @@ -820,6 +820,7 @@ + Modified: trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24647&path=/trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters (original) +++ trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj.filters Sun May 23 20:15:03 2021 @@ -548,6 +548,9 @@ Header Files + + Header Files + Header Files From scribus-commit at lists.scribus.net Thu May 27 04:59:14 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 27 May 2021 04:59:14 -0000 Subject: r24648 by craig - Bump TS files Message-ID: Author: craig Date: Thu May 27 04:59:14 2021 New Revision: 24648 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24648 Log: Bump TS files Modified: trunk/Scribus/resources/translations/scribus.af.ts trunk/Scribus/resources/translations/scribus.ar.ts trunk/Scribus/resources/translations/scribus.az.ts trunk/Scribus/resources/translations/scribus.be.ts trunk/Scribus/resources/translations/scribus.bg.ts trunk/Scribus/resources/translations/scribus.bn_IN.ts trunk/Scribus/resources/translations/scribus.br.ts trunk/Scribus/resources/translations/scribus.ca.ts trunk/Scribus/resources/translations/scribus.cs_CZ.ts trunk/Scribus/resources/translations/scribus.cy.ts trunk/Scribus/resources/translations/scribus.da_DK.ts trunk/Scribus/resources/translations/scribus.de.ts trunk/Scribus/resources/translations/scribus.de_1901.ts trunk/Scribus/resources/translations/scribus.de_CH.ts trunk/Scribus/resources/translations/scribus.el.ts trunk/Scribus/resources/translations/scribus.en_AU.ts trunk/Scribus/resources/translations/scribus.en_GB.ts trunk/Scribus/resources/translations/scribus.en_US.ts trunk/Scribus/resources/translations/scribus.eo.ts trunk/Scribus/resources/translations/scribus.es_AR.ts trunk/Scribus/resources/translations/scribus.es_ES.ts trunk/Scribus/resources/translations/scribus.et.ts trunk/Scribus/resources/translations/scribus.eu.ts trunk/Scribus/resources/translations/scribus.fa_IR.ts trunk/Scribus/resources/translations/scribus.fi.ts trunk/Scribus/resources/translations/scribus.fr.ts trunk/Scribus/resources/translations/scribus.gl.ts trunk/Scribus/resources/translations/scribus.he_IL.ts trunk/Scribus/resources/translations/scribus.hi_IN.ts trunk/Scribus/resources/translations/scribus.hr_HR.ts trunk/Scribus/resources/translations/scribus.hu.ts trunk/Scribus/resources/translations/scribus.id.ts trunk/Scribus/resources/translations/scribus.it.ts trunk/Scribus/resources/translations/scribus.ja.ts trunk/Scribus/resources/translations/scribus.kab.ts trunk/Scribus/resources/translations/scribus.kn_IN.ts trunk/Scribus/resources/translations/scribus.ko.ts trunk/Scribus/resources/translations/scribus.lt_LT.ts trunk/Scribus/resources/translations/scribus.ml.ts trunk/Scribus/resources/translations/scribus.mn_MN.ts trunk/Scribus/resources/translations/scribus.ms_MY.ts trunk/Scribus/resources/translations/scribus.nb_NO.ts trunk/Scribus/resources/translations/scribus.nl.ts trunk/Scribus/resources/translations/scribus.oc.ts trunk/Scribus/resources/translations/scribus.pl_PL.ts trunk/Scribus/resources/translations/scribus.pms.ts trunk/Scribus/resources/translations/scribus.pt.ts trunk/Scribus/resources/translations/scribus.pt_BR.ts trunk/Scribus/resources/translations/scribus.pt_PT.ts trunk/Scribus/resources/translations/scribus.ru.ts trunk/Scribus/resources/translations/scribus.sa.ts trunk/Scribus/resources/translations/scribus.si.ts trunk/Scribus/resources/translations/scribus.sk_SK.ts trunk/Scribus/resources/translations/scribus.sl.ts trunk/Scribus/resources/translations/scribus.so.ts trunk/Scribus/resources/translations/scribus.sq.ts trunk/Scribus/resources/translations/scribus.sr.ts trunk/Scribus/resources/translations/scribus.sv.ts trunk/Scribus/resources/translations/scribus.ta.ts trunk/Scribus/resources/translations/scribus.te.ts trunk/Scribus/resources/translations/scribus.th_TH.ts trunk/Scribus/resources/translations/scribus.tr.ts trunk/Scribus/resources/translations/scribus.uk.ts trunk/Scribus/resources/translations/scribus.zh_CN.ts trunk/Scribus/resources/translations/scribus.zh_TW.ts [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/Scribus/resources/translations/scribus.af.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.af.ts Modified: trunk/Scribus/resources/translations/scribus.ar.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ar.ts Modified: trunk/Scribus/resources/translations/scribus.az.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.az.ts Modified: trunk/Scribus/resources/translations/scribus.be.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.be.ts Modified: trunk/Scribus/resources/translations/scribus.bg.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.bg.ts Modified: trunk/Scribus/resources/translations/scribus.bn_IN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.bn_IN.ts Modified: trunk/Scribus/resources/translations/scribus.br.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.br.ts Modified: trunk/Scribus/resources/translations/scribus.ca.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ca.ts Modified: trunk/Scribus/resources/translations/scribus.cs_CZ.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.cs_CZ.ts Modified: trunk/Scribus/resources/translations/scribus.cy.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.cy.ts Modified: trunk/Scribus/resources/translations/scribus.da_DK.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.da_DK.ts Modified: trunk/Scribus/resources/translations/scribus.de.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.de.ts Modified: trunk/Scribus/resources/translations/scribus.de_1901.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.de_1901.ts Modified: trunk/Scribus/resources/translations/scribus.de_CH.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.de_CH.ts Modified: trunk/Scribus/resources/translations/scribus.el.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.el.ts Modified: trunk/Scribus/resources/translations/scribus.en_AU.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.en_AU.ts Modified: trunk/Scribus/resources/translations/scribus.en_GB.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.en_GB.ts Modified: trunk/Scribus/resources/translations/scribus.en_US.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.en_US.ts Modified: trunk/Scribus/resources/translations/scribus.eo.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.eo.ts Modified: trunk/Scribus/resources/translations/scribus.es_AR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.es_AR.ts Modified: trunk/Scribus/resources/translations/scribus.es_ES.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.es_ES.ts Modified: trunk/Scribus/resources/translations/scribus.et.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.et.ts Modified: trunk/Scribus/resources/translations/scribus.eu.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.eu.ts Modified: trunk/Scribus/resources/translations/scribus.fa_IR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.fa_IR.ts Modified: trunk/Scribus/resources/translations/scribus.fi.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.fi.ts Modified: trunk/Scribus/resources/translations/scribus.fr.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.fr.ts Modified: trunk/Scribus/resources/translations/scribus.gl.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.gl.ts Modified: trunk/Scribus/resources/translations/scribus.he_IL.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.he_IL.ts Modified: trunk/Scribus/resources/translations/scribus.hi_IN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.hi_IN.ts Modified: trunk/Scribus/resources/translations/scribus.hr_HR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.hr_HR.ts Modified: trunk/Scribus/resources/translations/scribus.hu.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.hu.ts Modified: trunk/Scribus/resources/translations/scribus.id.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.id.ts Modified: trunk/Scribus/resources/translations/scribus.it.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.it.ts Modified: trunk/Scribus/resources/translations/scribus.ja.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ja.ts Modified: trunk/Scribus/resources/translations/scribus.kab.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.kab.ts Modified: trunk/Scribus/resources/translations/scribus.kn_IN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.kn_IN.ts Modified: trunk/Scribus/resources/translations/scribus.ko.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ko.ts Modified: trunk/Scribus/resources/translations/scribus.lt_LT.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.lt_LT.ts Modified: trunk/Scribus/resources/translations/scribus.ml.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ml.ts Modified: trunk/Scribus/resources/translations/scribus.mn_MN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.mn_MN.ts Modified: trunk/Scribus/resources/translations/scribus.ms_MY.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ms_MY.ts Modified: trunk/Scribus/resources/translations/scribus.nb_NO.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.nb_NO.ts Modified: trunk/Scribus/resources/translations/scribus.nl.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.nl.ts Modified: trunk/Scribus/resources/translations/scribus.oc.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.oc.ts Modified: trunk/Scribus/resources/translations/scribus.pl_PL.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.pl_PL.ts Modified: trunk/Scribus/resources/translations/scribus.pms.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.pms.ts Modified: trunk/Scribus/resources/translations/scribus.pt.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.pt.ts Modified: trunk/Scribus/resources/translations/scribus.pt_BR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.pt_BR.ts Modified: trunk/Scribus/resources/translations/scribus.pt_PT.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.pt_PT.ts Modified: trunk/Scribus/resources/translations/scribus.ru.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ru.ts Modified: trunk/Scribus/resources/translations/scribus.sa.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.sa.ts Modified: trunk/Scribus/resources/translations/scribus.si.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.si.ts Modified: trunk/Scribus/resources/translations/scribus.sk_SK.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.sk_SK.ts Modified: trunk/Scribus/resources/translations/scribus.sl.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.sl.ts Modified: trunk/Scribus/resources/translations/scribus.so.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.so.ts Modified: trunk/Scribus/resources/translations/scribus.sq.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.sq.ts Modified: trunk/Scribus/resources/translations/scribus.sr.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.sr.ts Modified: trunk/Scribus/resources/translations/scribus.sv.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.sv.ts Modified: trunk/Scribus/resources/translations/scribus.ta.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.ta.ts Modified: trunk/Scribus/resources/translations/scribus.te.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.te.ts Modified: trunk/Scribus/resources/translations/scribus.th_TH.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.th_TH.ts Modified: trunk/Scribus/resources/translations/scribus.tr.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.tr.ts Modified: trunk/Scribus/resources/translations/scribus.uk.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.uk.ts Modified: trunk/Scribus/resources/translations/scribus.zh_CN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.zh_CN.ts Modified: trunk/Scribus/resources/translations/scribus.zh_TW.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24648&path=/trunk/Scribus/resources/translations/scribus.zh_TW.ts From scribus-commit at lists.scribus.net Thu May 27 21:22:44 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 27 May 2021 21:22:44 -0000 Subject: r24649 by craig - Some workarounds for building with Qt6 Message-ID: Author: craig Date: Thu May 27 21:22:44 2021 New Revision: 24649 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24649 Log: Some workarounds for building with Qt6 Modified: trunk/Scribus/scribus/CMakeLists.txt trunk/Scribus/scribus/third_party/zip/zip.cpp trunk/Scribus/scribus/util.h Modified: trunk/Scribus/scribus/CMakeLists.txt URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24649&path=/trunk/Scribus/scribus/CMakeLists.txt ============================================================================== --- trunk/Scribus/scribus/CMakeLists.txt (original) +++ trunk/Scribus/scribus/CMakeLists.txt Thu May 27 21:22:44 2021 @@ -5,7 +5,11 @@ # a custom target that is always built if (NOT CMAKE_VERSION VERSION_LESS "3.2.0") - add_custom_target(svnheader ALL COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_MODULE_PATH}/getsvn.cmake BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h) + if (WANT_QT6) + add_custom_target(svnheader ALL COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/modules/getsvn.cmake BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h) + else() + add_custom_target(svnheader ALL COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_MODULE_PATH}/getsvn.cmake BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h) + endif() else () add_custom_target(svnheader ALL DEPENDS svn_header ) # svn_header is nothing more than a unique string # creates svnheader.h using cmake script Modified: trunk/Scribus/scribus/third_party/zip/zip.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24649&path=/trunk/Scribus/scribus/third_party/zip/zip.cpp ============================================================================== --- trunk/Scribus/scribus/third_party/zip/zip.cpp (original) +++ trunk/Scribus/scribus/third_party/zip/zip.cpp Thu May 27 21:22:44 2021 @@ -543,7 +543,7 @@ while (b != e) { const ZippedDir& zd = b.value(); if (zd.files <= 0) { - ec = createEntry(b.key(), zd.actualRoot, level); + ec = createEntry(QFileInfo(b.key()), zd.actualRoot, level); } ++b; } Modified: trunk/Scribus/scribus/util.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24649&path=/trunk/Scribus/scribus/util.h ============================================================================== --- trunk/Scribus/scribus/util.h (original) +++ trunk/Scribus/scribus/util.h Thu May 27 21:22:44 2021 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -176,10 +177,11 @@ // capture the name and the index, if any // fred (5) // ^^^^ ^ (where ^ means captured) - static QRegExp rx("^(.*)\\s+\\((\\d+)\\)$"); - if (rx.indexIn(newName) != -1) + static QRegularExpression rx("^(.*)\\s+\\((\\d+)\\)$"); + QRegularExpressionMatch match = rx.match(newName); + if (match.hasMatch()) { - QStringList matches = rx.capturedTexts(); + QStringList matches = rx.namedCaptureGroups(); prefix = matches[1]; suffixNum = matches[2].toInt(); } From scribus-commit at lists.scribus.net Thu May 27 21:39:13 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 27 May 2021 21:39:13 -0000 Subject: r24650 by craig - Fix missing include for QTextCodec Message-ID: Author: craig Date: Thu May 27 21:39:13 2021 New Revision: 24650 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24650 Log: Fix missing include for QTextCodec Modified: trunk/Scribus/scribus/third_party/rtf-qt/AbstractRtfOutput.h Modified: trunk/Scribus/scribus/third_party/rtf-qt/AbstractRtfOutput.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24650&path=/trunk/Scribus/scribus/third_party/rtf-qt/AbstractRtfOutput.h ============================================================================== --- trunk/Scribus/scribus/third_party/rtf-qt/AbstractRtfOutput.h (original) +++ trunk/Scribus/scribus/third_party/rtf-qt/AbstractRtfOutput.h Thu May 27 21:39:13 2021 @@ -22,6 +22,7 @@ #include #include #include +#include #include "FontTableEntry.h" class ParagraphStyle; From scribus-commit at lists.scribus.net Thu May 27 21:49:05 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 27 May 2021 21:49:05 -0000 Subject: r24651 by craig - Include Qt6 Network module Message-ID: Author: craig Date: Thu May 27 21:49:05 2021 New Revision: 24651 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24651 Log: Include Qt6 Network module Modified: trunk/Scribus/CMakeLists_Dependencies.cmake trunk/Scribus/scribus/CMakeLists.txt Modified: trunk/Scribus/CMakeLists_Dependencies.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24651&path=/trunk/Scribus/CMakeLists_Dependencies.cmake ============================================================================== --- trunk/Scribus/CMakeLists_Dependencies.cmake (original) +++ trunk/Scribus/CMakeLists_Dependencies.cmake Thu May 27 21:49:05 2021 @@ -68,21 +68,29 @@ #WANT QT6 message(STATUS "Qt6 Requested") find_package(Qt6 COMPONENTS Core REQUIRED) + add_definitions(${Qt6Core_DEFINITIONS}) + include_directories(${Qt6Core_INCLUDE_DIRS}) + find_package(Qt6 COMPONENTS Core5Compat REQUIRED) - find_package(Qt6 COMPONENTS Gui REQUIRED) - find_package(Qt6 COMPONENTS Widgets REQUIRED) - include_directories(${Qt6Core_INCLUDE_DIRS}) - add_definitions(${Qt6Core_DEFINITIONS}) include_directories(${Qt6Core5Compat_INCLUDE_DIRS}) add_definitions(${Qt6Core5Compat_DEFINITIONS}) + + find_package(Qt6 COMPONENTS Gui REQUIRED) + include_directories(${Qt6Gui_INCLUDE_DIRS}) + add_definitions(${Qt6Gui_DEFINITIONS}) + + find_package(Qt6 COMPONENTS Widgets REQUIRED) include_directories(${Qt6Widgets_INCLUDE_DIRS}) add_definitions(${Qt6Widgets_DEFINITIONS}) - include_directories(${Qt6Gui_INCLUDE_DIRS}) - add_definitions(${Qt6Gui_DEFINITIONS}) -# include_directories(${Qt5Xml_INCLUDE_DIRS}) + + find_package(Qt6 COMPONENTS Network REQUIRED) + include_directories(${Qt6Network_INCLUDE_DIRS}) + add_definitions(${Qt6Network_DEFINITIONS}) + + + # include_directories(${Qt5Xml_INCLUDE_DIRS}) # add_definitions(${Qt5Xml_DEFINITIONS}) -# include_directories(${Qt5Network_INCLUDE_DIRS}) -# add_definitions(${Qt5Network_DEFINITIONS}) + # include_directories(${Qt5OpenGL_INCLUDE_DIRS}) # add_definitions(${Qt5OpenGL_DEFINITIONS}) # include_directories(${Qt5PrintSupport_INCLUDE_DIRS}) Modified: trunk/Scribus/scribus/CMakeLists.txt URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24651&path=/trunk/Scribus/scribus/CMakeLists.txt ============================================================================== --- trunk/Scribus/scribus/CMakeLists.txt (original) +++ trunk/Scribus/scribus/CMakeLists.txt Thu May 27 21:49:05 2021 @@ -795,6 +795,7 @@ Qt6::Core5Compat Qt6::Gui Qt6::Widgets + Qt6::Network ) endif() From scribus-commit at lists.scribus.net Sat May 29 13:52:52 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 29 May 2021 13:52:52 -0000 Subject: r24652 by jghali - #16567: Import PDF as text should create 1-column text frames Message-ID: Author: jghali Date: Sat May 29 13:52:52 2021 New Revision: 24652 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24652 Log: #16567: Import PDF as text should create 1-column text frames Modified: trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp Modified: trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24652&path=/trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp (original) +++ trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp Sat May 29 13:52:52 2021 @@ -519,6 +519,9 @@ cStyle.setScaleV(1000.0); cStyle.setHyphenChar(SpecialChars::BLANK.unicode()); + // #16567: Override user prefs + textNode->setColumns(1); + Selection tempSelection(nullptr, false); tempSelection.addItem(textNode); m_doc->itemSelection_ApplyParagraphStyle(pStyle, &tempSelection); From scribus-commit at lists.scribus.net Sat May 29 14:36:51 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 29 May 2021 14:36:51 -0000 Subject: r24653 by jghali - Fix compiler warning Message-ID: Author: jghali Date: Sat May 29 14:36:51 2021 New Revision: 24653 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24653 Log: Fix compiler warning Modified: trunk/Scribus/scribus/util_image.h Modified: trunk/Scribus/scribus/util_image.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24653&path=/trunk/Scribus/scribus/util_image.h ============================================================================== --- trunk/Scribus/scribus/util_image.h (original) +++ trunk/Scribus/scribus/util_image.h Sat May 29 14:36:51 2021 @@ -53,7 +53,7 @@ for (uint64_t i = 0; i < samples; ++i) { - input = (static_cast(*dataIn) + 32768); + input = (static_cast(*dataIn) + 32768); output = input >> 8; *dataOut = output; ++dataIn; From scribus-commit at lists.scribus.net Sat May 29 16:39:00 2021 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 29 May 2021 16:39:00 -0000 Subject: r24654 by jghali - Fix compiler warnings Message-ID: Author: jghali Date: Sat May 29 16:39:00 2021 New Revision: 24654 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24654 Log: Fix compiler warnings Modified: trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp Modified: trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24654&path=/trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp (original) +++ trunk/Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp Sat May 29 16:39:00 2021 @@ -503,7 +503,6 @@ qreal xCoor = m_doc->currentPage()->xOffset() + activePdfTextRegion->pdfTextRegionBasenOrigin.x(); qreal yCoor = m_doc->currentPage()->yOffset() + activePdfTextRegion->pdfTextRegionBasenOrigin.y() - activePdfTextRegion->lineSpacing; // don't know if y is top down or bottom up - qreal lineWidth = 0.0; #ifdef DEBUG_TEXT_IMPORT qDebug() << "rendering new frame at:" << xCoor << "," << yCoor << " With lineheight of: " << activePdfTextRegion->lineSpacing << "Height:" << activePdfTextRegion->maxHeight << " Width:" << activePdfTextRegion->maxWidth; #endif @@ -536,7 +535,7 @@ textNode->setLineTransparency(1.0); textNode->setFillColor(CommonStrings::None); textNode->setLineColor(CommonStrings::None); - textNode->setLineWidth(0); + textNode->setLineWidth(0.0); textNode->setFillShade(m_currFillShade); @@ -552,9 +551,9 @@ g_free(transform); */ - int shade = 100; /* * This code sets the font and style in a very simplistic way, it's been commented out as it needs to be updated to be used within PdfTextRecognition &co. + int shade = 100; QString CurrColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade); applyTextStyleToCharStyle(pStyle.charStyle(), _glyphs[0].style->getFont().family(), CurrColorText, _glyphs[0].style->getFont().pointSizeF());// *_font_scaling); */