From 62eecb9c500bb09b0d3486ec9c4bf06e5bcd1906 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 23 Jul 2008 16:35:04 +0000 Subject: [PATCH] --- src/juce_appframework/gui/graphics/contexts/juce_Graphics.h | 4 ++-- src/juce_core/misc/juce_ZipFile.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/juce_appframework/gui/graphics/contexts/juce_Graphics.h b/src/juce_appframework/gui/graphics/contexts/juce_Graphics.h index 0dfa8daa28..a962116893 100644 --- a/src/juce_appframework/gui/graphics/contexts/juce_Graphics.h +++ b/src/juce_appframework/gui/graphics/contexts/juce_Graphics.h @@ -584,7 +584,7 @@ public: int sourceClipWidth, int sourceClipHeight, const AffineTransform& transform, - const bool fillAlphaChannelWithCurrentBrush) const throw(); + const bool fillAlphaChannelWithCurrentBrush = false) const throw(); /** Draws an image to fit within a designated rectangle. @@ -613,7 +613,7 @@ public: const int destWidth, const int destHeight, const RectanglePlacement& placementWithinTarget, - const bool fillAlphaChannelWithCurrentBrush) const throw(); + const bool fillAlphaChannelWithCurrentBrush = false) const throw(); //============================================================================== diff --git a/src/juce_core/misc/juce_ZipFile.cpp b/src/juce_core/misc/juce_ZipFile.cpp index 3b18302781..b195bc23d5 100644 --- a/src/juce_core/misc/juce_ZipFile.cpp +++ b/src/juce_core/misc/juce_ZipFile.cpp @@ -366,11 +366,12 @@ int ZipFile::findEndOfZipEntryTable (InputStream* input) in.setPosition (in.getTotalLength()); int64 pos = in.getPosition(); + const int64 lowestPos = jmax ((int64) 0, pos - 1024); char buffer [32]; zeromem (buffer, sizeof (buffer)); - while (pos > 0) + while (pos > lowestPos) { in.setPosition (pos - 22); pos = in.getPosition();