head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.42
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.40
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.38
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.36
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.34
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.32
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.30
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.28
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.26
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.24
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.22
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.20
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.18
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.16
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.14
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.12
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.10
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.8
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.6
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.4
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.2
	pkgsrc-2005Q2-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2005.05.31.14.13.24;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2005.04.18.16.54.00;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
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-dh,v 1.1 2005/04/18 16:54:00 drochner Exp $

--- kimgio/g3r.cpp.orig	2005-04-16 23:06:10.000000000 +0200
+++ kimgio/g3r.cpp
@@@@ -28,7 +28,7 @@@@ KDE_EXPORT void kimgio_g3_read( QImageIO
 
   QImage image(width, height, 1, 0, QImage::BigEndian);
   
-  if (scanlength != image.bytesPerLine())
+  if (image.isNull() || scanlength != image.bytesPerLine())
     {
       TIFFClose(tiff);
       return;
@


1.1
log
@Add an explicite check to a QImage construction. There is an inplicite
check, but it is not obvious whether it will catch all cases, in
particular with corrupted TIFF files. Was the last occurence of an
not-explicitely-checked QImage construction, so things are consistent now.
@
text
@d1 1
a1 1
$NetBSD$
@