head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.42 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.40 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.38 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.36 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.32 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.30 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.28 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.26 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.24 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.22 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.20 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.18 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.16 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.14 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.12 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.10 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.8 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.6 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.4 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.1.0.2; locks; strict; comment @# @; 1.3 date 2005.05.31.14.13.24; author markd; state dead; branches; next 1.2; 1.2 date 2005.05.04.13.45.51; author markd; state Exp; branches; next 1.1; 1.1 date 2005.05.01.04.35.40; author markd; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.05.01.04.35.40; author salo; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2005.05.01.22.06.21; author salo; state Exp; branches; next 1.1.2.3; 1.1.2.3 date 2005.05.12.13.56.25; author salo; state Exp; branches; next ; desc @@ 1.3 log @Update to KDE 3.4.1 Changes: * kdecore: Fix in command-line argument handler for clicking on mailto urls while kontact was started with arguments * kdecore: Fix the support for Dante proxies * kdecore: Fix the "random resolver failure" problem * kdecore: Fix the support for the IPv6 Blacklist in ioslaves * kdeui: Fix "Change Icon" in the toolbar editor * khtml: Fix submitted position for scrolled imagemaps * khtml: Load external CSS style-sheet with correct charset * khtml: Apply CSS padding to tables * khtml: Improve PRE parsing * khtml: Fix links with WBR tags * khtml: Parse CSS3 pseudo-classes and pseudo-elements more strict * khtml: Fix document.all.item * khtml: Return meaningful HTMLTableCellElement::cellIndex() values * khtml: Unbreak setting of location.href on windows opened by windows.open() * khtml: Various crash fixes * khtml: Fixed infinite loop due to onChange from textareas * khtml: Fix crash in window.setTimeout when Javascript is disabled * khtml: Fix server-side-push handler to accept bugzilla sending "text/html; charset=utf-8" as Content-Type * khtml: Fix for MMB-pasting onto an empty konqueror window * kjs: Allow non-ascii letters in identifiers * kjs: More flexible date string parsing * kjs: Fixes in escape() and unescape() functions * kjs: Fixes in RegExp constructor * kssl: store SSL passwords in the KDE wallet and reuse as needed * kio: KZip: Fixed double-deletion bug when trying to write to a non-writable directory. * kio: Fix for print:/manager not embedding the right part in Konqueror * kio: Use correct window icon in Konqueror when showing trash:/ * kfile: Don't show edit dialog when drop-adding items to sidebar * kfile: If Shift is pressed when menu opens show 'Delete' instead of 'Trash' * kio-http: Prevent endless busy loop * kio-http: Massive speed improvement for deleting Webdav folders * kio-ftp: Try non-passive mode if passive mode fails * kio-ftp: Fix parsing of Netware FTP servers, so that files don't all appear with a lock (no permissions) * kutils: Fixed support for back ref \0 (entire matched text) @ text @$NetBSD: patch-dk,v 1.2 2005/05/04 13:45:51 markd Exp $ --- kimgio/rgb.cpp.orig 2005-02-04 12:33:17.000000000 +1300 +++ kimgio/rgb.cpp @@@@ -87,7 +87,9 @@@@ bool SGIImage::getRow(uchar *dest) int n, i; if (!m_rle) { for (i = 0; i < m_xsize; i++) { - *dest++ = uchar(*m_pos); + if(m_pos >= m_data.end()) + return false; + dest[i] = uchar(*m_pos); m_pos += m_bpc; } return true; @@@@ -120,7 +122,7 @@@@ bool SGIImage::readData(QImage& img) { QRgb *c; Q_UINT32 *start = m_starttab; - QCString lguard(m_xsize); + QByteArray lguard(m_xsize); uchar *line = (uchar *)lguard.data(); unsigned x, y; @@@@ -128,7 +130,7 @@@@ bool SGIImage::readData(QImage& img) m_pos = m_data.begin(); for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); + c = (QRgb *) img.scanLine(m_ysize - y - 1); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) @@@@ -166,11 +168,11 @@@@ bool SGIImage::readData(QImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; + c = (QRgb*) img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]); } @ 1.2 log @Previous patch introduced a regression, breaking reading of .rgb images in most cases. From http://www.kde.org/info/security/advisory-20050504-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-dk,v 1.1 2005/05/01 04:35:40 markd Exp $ @ 1.1 log @Apply the official KDE patches for CAN-2005-1046. http://www.kde.org/info/security/advisory-20050421-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ a46 9 @@@@ -270,7 +272,7 @@@@ bool SGIImage::readImage(QImage& img) // sanity ckeck if (m_rle) for (uint o = 0; o < m_numrows; o++) - if (m_starttab[o] + m_lengthtab[o] > m_data.size()) { + if (m_starttab[o] + m_lengthtab[o] >= m_data.size()) { kdDebug(399) << "image corrupt (sanity check failed)" << endl; return false; } @ 1.1.2.1 log @file patch-dk was added on branch pkgsrc-2005Q1 on 2005-05-01 04:35:40 +0000 @ text @d1 55 @ 1.1.2.2 log @Pullup ticket 475 - requested by Mark Davies security fix for kdelibs3 Patch provided by the submitter. Module Name: pkgsrc Committed By: markd Date: Sun May 1 04:35:40 UTC 2005 Modified Files: pkgsrc/x11/kdelibs3: Makefile distinfo pkgsrc/x11/kdelibs3/patches: patch-dc patch-dd patch-de Added Files: pkgsrc/x11/kdelibs3/patches: patch-di patch-dk patch-dl patch-dm patch-dn Log Message: Apply the official KDE patches for CAN-2005-1046. http://www.kde.org/info/security/advisory-20050421-1.txt Bump PKGREVISION. @ text @a0 145 $NetBSD: patch-dk,v 1.1.2.1 2005/05/01 22:06:21 salo Exp $ --- kimgio/rgb.cpp.orig 2004-06-23 05:36:40.000000000 +1200 +++ kimgio/rgb.cpp @@@@ -87,7 +87,9 @@@@ bool SGIImage::getRow(uchar *dest) int n, i; if (!m_rle) { for (i = 0; i < m_xsize; i++) { - *dest++ = uchar(*m_pos); + if(m_pos >= m_data.end()) + return false; + dest[i] = uchar(*m_pos); m_pos += m_bpc; } return true; @@@@ -120,7 +122,7 @@@@ bool SGIImage::readData(QImage& img) { QRgb *c; Q_UINT32 *start = m_starttab; - QCString lguard(m_xsize); + QByteArray lguard(m_xsize); uchar *line = (uchar *)lguard.data(); unsigned x, y; @@@@ -128,7 +130,7 @@@@ bool SGIImage::readData(QImage& img) m_pos = m_data.begin(); for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); + c = (QRgb *) img.scanLine(m_ysize - y - 1); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) @@@@ -166,11 +168,11 @@@@ bool SGIImage::readData(QImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; + c = (QRgb*) img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]); } @@@@ -270,7 +272,7 @@@@ bool SGIImage::readImage(QImage& img) // sanity ckeck if (m_rle) for (uint o = 0; o < m_numrows; o++) - if (m_starttab[o] + m_lengthtab[o] > m_data.size()) { + if (m_starttab[o] + m_lengthtab[o] >= m_data.size()) { kdDebug(399) << "image corrupt (sanity check failed)" << endl; return false; } @@@@ -351,24 +353,32 @@@@ uchar SGIImage::intensity(uchar c) uint SGIImage::compact(uchar *d, uchar *s) { - uchar *dest = d, *src = s, patt, *cnt; - int n; - while (src - s < m_xsize) { - if (src - s + 1 == m_xsize) { // last bit - *dest++ = 0x81; - *dest++ = *src; + uchar *dest = d, *src = s, patt, *t, *end = s + m_xsize; + int i, n; + while (src < end) { + for (n = 0, t = src; t + 2 < end && !(*t == t[1] && *t == t[2]); t++) + n++; + + while (n) { + i = n > 126 ? 126 : n; + n -= i; + *dest++ = 0x80 | i; + while (i--) + *dest++ = *src++; + } + + if (src == end) break; - } else if (*src == src[1]) { - patt = *src++; - for (n = 1; src - s < m_xsize && n < 126 && *src == patt; src++) - n++; - *dest++ = n; + + patt = *src++; + for (n = 1; src < end && *src == patt; src++) + n++; + + while (n) { + i = n > 126 ? 126 : n; + n -= i; + *dest++ = i; *dest++ = patt; - } else { - cnt = dest++; - for (n = 0; src - s < m_xsize && n < 126 && *src != src[1]; n++) - *dest++ = *src++; - *cnt = 0x80 | n; } } *dest++ = 0; @@@@ -444,16 +454,12 @@@@ void SGIImage::writeHeader() kdDebug(399) << "Description: " << desc << endl; desc.truncate(79); - char id[] = "KDE kimgio", *s = id; for (i = 0; i < desc.length(); i++) m_imagename[i] = desc.latin1()[i]; for (; i < 80; i++) m_imagename[i] = '\0'; - if (desc.length() < 68) - for (i = 69; *s; i++) - m_imagename[i] = *s++; - m_stream.writeRawBytes(m_imagename, 80); + m_stream << m_colormap; for (i = 0; i < 404; i++) m_stream << Q_UINT8(0); @@@@ -551,13 +557,6 @@@@ bool SGIImage::writeImage(QImage& img) m_numrows = m_ysize * m_zsize; - // compressing a row with up to 11 pixels takes 11 or more bytes - // (start/length table: 8, smallest possible RLE packet: 3) - if (m_xsize <= 11) { - writeVerbatim(img); - return true; - } - m_starttab = new Q_UINT32[m_numrows]; m_rlemap.setBaseOffset(512 + m_numrows * 2 * sizeof(Q_UINT32)); @@@@ -579,7 +578,7 @@@@ bool SGIImage::writeImage(QImage& img) kdDebug(399) << "total savings: " << (verbatim_size - rle_size) << " bytes" << endl; kdDebug(399) << "compression: " << (rle_size * 100.0 / verbatim_size) << '%' << endl; - if (verbatim_size <= rle_size) + if (verbatim_size <= rle_size || m_io->quality() > 50) writeVerbatim(img); else writeRle(); @ 1.1.2.3 log @Pullup ticket 480 - requested by Mark Davies fir for regression in kdelibs3 Patch provided by the submitter. Module Name: pkgsrc Committed By: markd Date: Wed May 4 13:45:51 UTC 2005 Modified Files: pkgsrc/x11/kdelibs3: Makefile distinfo pkgsrc/x11/kdelibs3/patches: patch-dk Log Message: Previous patch introduced a regression, breaking reading of .rgb images in most cases. From http://www.kde.org/info/security/advisory-20050504-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-dk,v 1.1.2.2 2005/05/12 13:56:25 salo Exp $ d47 9 @