mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-02-07 04:10:08 +00:00
Fixed some namespace issues with png and zlib. Changed the way the DBG macro works to allow expressions like DBG ("foo" << 123 << "bar"), so that it's easier to dump out numbers.
This commit is contained in:
Julian Storer
parent
dcaa6ceb36
commit
d033a859ef
13 changed files with 98 additions and 111 deletions
|
|
@ -242,8 +242,12 @@ void ProjectTreeViewBase::deleteAllSelectedItems()
|
|||
for (i = itemsToRemove.size(); --i >= 0;)
|
||||
{
|
||||
ProjectTreeViewBase* itemToRemove = treeRootItem->findTreeViewItem (*itemsToRemove.getUnchecked(i));
|
||||
|
||||
if (itemToRemove != 0)
|
||||
{
|
||||
OpenDocumentManager::getInstance()->closeFile (itemToRemove->getFile(), false);
|
||||
itemToRemove->deleteItem();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96140,7 +96140,7 @@ typedef uLong FAR uLongf;
|
|||
/*** End of inlined file: zconf.h ***/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
//extern "C" {
|
||||
#endif
|
||||
|
||||
#define ZLIB_VERSION "1.2.3"
|
||||
|
|
@ -97448,7 +97448,7 @@ ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
|
|||
ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
//}
|
||||
#endif
|
||||
|
||||
#endif /* ZLIB_H */
|
||||
|
|
@ -97633,12 +97633,10 @@ END_JUCE_NAMESPACE
|
|||
namespace zlibNamespace
|
||||
{
|
||||
#if JUCE_INCLUDE_ZLIB_CODE
|
||||
extern "C"
|
||||
{
|
||||
#undef OS_CODE
|
||||
#undef fdopen
|
||||
#define ZLIB_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
#undef OS_CODE
|
||||
#undef fdopen
|
||||
#define ZLIB_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
|
||||
|
||||
/*** Start of inlined file: adler32.c ***/
|
||||
|
|
@ -97849,8 +97847,8 @@ uLong ZEXPORT compressBound (uLong sourceLen)
|
|||
}
|
||||
/*** End of inlined file: compress.c ***/
|
||||
|
||||
#undef DO1
|
||||
#undef DO8
|
||||
#undef DO1
|
||||
#undef DO8
|
||||
|
||||
/*** Start of inlined file: crc32.c ***/
|
||||
/* @(#) $Id: crc32.c,v 1.1 2007/06/07 17:54:37 jules_rms Exp $ */
|
||||
|
|
@ -101458,13 +101456,13 @@ void inflate_fast (z_streamp strm, unsigned start)
|
|||
#endif /* !ASMINF */
|
||||
/*** End of inlined file: inffast.c ***/
|
||||
|
||||
#undef PULLBYTE
|
||||
#undef LOAD
|
||||
#undef RESTORE
|
||||
#undef INITBITS
|
||||
#undef NEEDBITS
|
||||
#undef DROPBITS
|
||||
#undef BYTEBITS
|
||||
#undef PULLBYTE
|
||||
#undef LOAD
|
||||
#undef RESTORE
|
||||
#undef INITBITS
|
||||
#undef NEEDBITS
|
||||
#undef DROPBITS
|
||||
#undef BYTEBITS
|
||||
|
||||
/*** Start of inlined file: inflate.c ***/
|
||||
/*
|
||||
|
|
@ -104846,8 +104844,7 @@ void zcfree (voidpf opaque, voidpf ptr)
|
|||
#endif /* MY_ZCALLOC */
|
||||
/*** End of inlined file: zutil.c ***/
|
||||
|
||||
#undef Byte
|
||||
}
|
||||
#undef Byte
|
||||
#else
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
|
@ -211043,18 +211040,16 @@ namespace pnglibNamespace
|
|||
|
||||
#if JUCE_INCLUDE_PNGLIB_CODE
|
||||
|
||||
#if _MSC_VER != 1310
|
||||
using ::calloc; // (causes conflict in VS.NET 2003)
|
||||
using ::malloc;
|
||||
using ::free;
|
||||
#endif
|
||||
#if _MSC_VER != 1310
|
||||
using ::calloc; // (causes conflict in VS.NET 2003)
|
||||
using ::malloc;
|
||||
using ::free;
|
||||
#endif
|
||||
|
||||
extern "C"
|
||||
{
|
||||
using ::abs;
|
||||
#define PNG_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
#define PNG_SETJMP_NOT_SUPPORTED
|
||||
using ::abs;
|
||||
#define PNG_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
#define PNG_SETJMP_NOT_SUPPORTED
|
||||
|
||||
|
||||
/*** Start of inlined file: png.h ***/
|
||||
|
|
@ -213009,7 +213004,7 @@ typedef z_stream FAR * png_zstreamp;
|
|||
|
||||
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
//extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/* This file is arranged in several sections. The first section contains
|
||||
|
|
@ -216090,7 +216085,7 @@ png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
|
|||
#endif /* PNG_INTERNAL */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
//}
|
||||
#endif
|
||||
|
||||
#endif /* PNG_VERSION_INFO_ONLY */
|
||||
|
|
@ -216098,7 +216093,7 @@ png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
|
|||
#endif /* PNG_H */
|
||||
/*** End of inlined file: png.h ***/
|
||||
|
||||
#define PNG_NO_EXTERN
|
||||
#define PNG_NO_EXTERN
|
||||
|
||||
/*** Start of inlined file: png.c ***/
|
||||
/* png.c - location for general purpose libpng functions
|
||||
|
|
@ -236448,7 +236443,6 @@ png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
|
|||
#endif /* PNG_WRITE_SUPPORTED */
|
||||
/*** End of inlined file: pngwutil.c ***/
|
||||
|
||||
}
|
||||
#else
|
||||
extern "C"
|
||||
{
|
||||
|
|
@ -251680,7 +251674,7 @@ public:
|
|||
|
||||
while (! threadShouldExit())
|
||||
{
|
||||
const DWORD result = useExclusiveMode ? WaitForSingleObject (inputDevice->clientEvent, 1000)
|
||||
const DWORD result = useExclusiveMode ? (inputDevice != 0 ? WaitForSingleObject (inputDevice->clientEvent, 1000) : S_OK)
|
||||
: WaitForMultipleObjects (numEvents, events, true, 1000);
|
||||
if (result == WAIT_TIMEOUT)
|
||||
continue;
|
||||
|
|
@ -254765,10 +254759,6 @@ void* PlatformUtilities::getProcedureEntryPoint (void* libraryHandle, const Stri
|
|||
// compiled on its own).
|
||||
#if JUCE_INCLUDED_FILE
|
||||
|
||||
#if JUCE_DEBUG
|
||||
#define JUCE_DEBUG_XERRORS 1
|
||||
#endif
|
||||
|
||||
extern Display* display;
|
||||
extern Window juce_messageWindowHandle;
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
*/
|
||||
#define JUCE_MAJOR_VERSION 1
|
||||
#define JUCE_MINOR_VERSION 52
|
||||
#define JUCE_BUILDNUMBER 47
|
||||
#define JUCE_BUILDNUMBER 48
|
||||
|
||||
/** Current Juce version number.
|
||||
|
||||
|
|
@ -536,7 +536,7 @@
|
|||
|
||||
@see Logger::outputDebugString
|
||||
*/
|
||||
#define DBG(dbgtext) JUCE_NAMESPACE::Logger::outputDebugString (dbgtext);
|
||||
#define DBG(dbgtext) { String tempDbgBuf; tempDbgBuf << dbgtext; JUCE_NAMESPACE::Logger::outputDebugString (tempDbgBuf); }
|
||||
|
||||
// Assertions..
|
||||
|
||||
|
|
@ -16772,7 +16772,8 @@ private:
|
|||
#ifndef __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__
|
||||
#define __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__
|
||||
|
||||
/** Writes data to an internal memory buffer, which grows as required.
|
||||
/**
|
||||
Writes data to an internal memory buffer, which grows as required.
|
||||
|
||||
The data that was written into the stream can then be accessed later as
|
||||
a contiguous block of memory.
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
|
||||
@see Logger::outputDebugString
|
||||
*/
|
||||
#define DBG(dbgtext) JUCE_NAMESPACE::Logger::outputDebugString (dbgtext);
|
||||
#define DBG(dbgtext) { String tempDbgBuf; tempDbgBuf << dbgtext; JUCE_NAMESPACE::Logger::outputDebugString (tempDbgBuf); }
|
||||
|
||||
//==============================================================================
|
||||
// Assertions..
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*/
|
||||
#define JUCE_MAJOR_VERSION 1
|
||||
#define JUCE_MINOR_VERSION 52
|
||||
#define JUCE_BUILDNUMBER 47
|
||||
#define JUCE_BUILDNUMBER 48
|
||||
|
||||
/** Current Juce version number.
|
||||
|
||||
|
|
|
|||
|
|
@ -48,39 +48,36 @@ namespace pnglibNamespace
|
|||
|
||||
#if JUCE_INCLUDE_PNGLIB_CODE
|
||||
|
||||
#if _MSC_VER != 1310
|
||||
using ::calloc; // (causes conflict in VS.NET 2003)
|
||||
using ::malloc;
|
||||
using ::free;
|
||||
#endif
|
||||
#if _MSC_VER != 1310
|
||||
using ::calloc; // (causes conflict in VS.NET 2003)
|
||||
using ::malloc;
|
||||
using ::free;
|
||||
#endif
|
||||
|
||||
extern "C"
|
||||
{
|
||||
using ::abs;
|
||||
#define PNG_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
#define PNG_SETJMP_NOT_SUPPORTED
|
||||
using ::abs;
|
||||
#define PNG_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
#define PNG_SETJMP_NOT_SUPPORTED
|
||||
|
||||
#include "pnglib/png.h"
|
||||
#include "pnglib/pngconf.h"
|
||||
#include "pnglib/png.h"
|
||||
#include "pnglib/pngconf.h"
|
||||
|
||||
#define PNG_NO_EXTERN
|
||||
#include "pnglib/png.c"
|
||||
#include "pnglib/pngerror.c"
|
||||
#include "pnglib/pngget.c"
|
||||
#include "pnglib/pngmem.c"
|
||||
#include "pnglib/pngread.c"
|
||||
#include "pnglib/pngpread.c"
|
||||
#include "pnglib/pngrio.c"
|
||||
#include "pnglib/pngrtran.c"
|
||||
#include "pnglib/pngrutil.c"
|
||||
#include "pnglib/pngset.c"
|
||||
#include "pnglib/pngtrans.c"
|
||||
#include "pnglib/pngwio.c"
|
||||
#include "pnglib/pngwrite.c"
|
||||
#include "pnglib/pngwtran.c"
|
||||
#include "pnglib/pngwutil.c"
|
||||
}
|
||||
#define PNG_NO_EXTERN
|
||||
#include "pnglib/png.c"
|
||||
#include "pnglib/pngerror.c"
|
||||
#include "pnglib/pngget.c"
|
||||
#include "pnglib/pngmem.c"
|
||||
#include "pnglib/pngread.c"
|
||||
#include "pnglib/pngpread.c"
|
||||
#include "pnglib/pngrio.c"
|
||||
#include "pnglib/pngrtran.c"
|
||||
#include "pnglib/pngrutil.c"
|
||||
#include "pnglib/pngset.c"
|
||||
#include "pnglib/pngtrans.c"
|
||||
#include "pnglib/pngwio.c"
|
||||
#include "pnglib/pngwrite.c"
|
||||
#include "pnglib/pngwtran.c"
|
||||
#include "pnglib/pngwutil.c"
|
||||
#else
|
||||
extern "C"
|
||||
{
|
||||
|
|
|
|||
|
|
@ -448,7 +448,7 @@
|
|||
|
||||
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
//extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/* This file is arranged in several sections. The first section contains
|
||||
|
|
@ -3531,7 +3531,7 @@ png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
|
|||
#endif /* PNG_INTERNAL */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
//}
|
||||
#endif
|
||||
|
||||
#endif /* PNG_VERSION_INFO_ONLY */
|
||||
|
|
|
|||
|
|
@ -33,33 +33,30 @@
|
|||
namespace zlibNamespace
|
||||
{
|
||||
#if JUCE_INCLUDE_ZLIB_CODE
|
||||
extern "C"
|
||||
{
|
||||
#undef OS_CODE
|
||||
#undef fdopen
|
||||
#define ZLIB_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
#include "zlib/zlib.h"
|
||||
#include "zlib/adler32.c"
|
||||
#include "zlib/compress.c"
|
||||
#undef DO1
|
||||
#undef DO8
|
||||
#include "zlib/crc32.c"
|
||||
#include "zlib/deflate.c"
|
||||
#include "zlib/inffast.c"
|
||||
#undef PULLBYTE
|
||||
#undef LOAD
|
||||
#undef RESTORE
|
||||
#undef INITBITS
|
||||
#undef NEEDBITS
|
||||
#undef DROPBITS
|
||||
#undef BYTEBITS
|
||||
#include "zlib/inflate.c"
|
||||
#include "zlib/inftrees.c"
|
||||
#include "zlib/trees.c"
|
||||
#include "zlib/zutil.c"
|
||||
#undef Byte
|
||||
}
|
||||
#undef OS_CODE
|
||||
#undef fdopen
|
||||
#define ZLIB_INTERNAL
|
||||
#define NO_DUMMY_DECL
|
||||
#include "zlib/zlib.h"
|
||||
#include "zlib/adler32.c"
|
||||
#include "zlib/compress.c"
|
||||
#undef DO1
|
||||
#undef DO8
|
||||
#include "zlib/crc32.c"
|
||||
#include "zlib/deflate.c"
|
||||
#include "zlib/inffast.c"
|
||||
#undef PULLBYTE
|
||||
#undef LOAD
|
||||
#undef RESTORE
|
||||
#undef INITBITS
|
||||
#undef NEEDBITS
|
||||
#undef DROPBITS
|
||||
#undef BYTEBITS
|
||||
#include "zlib/inflate.c"
|
||||
#include "zlib/inftrees.c"
|
||||
#include "zlib/trees.c"
|
||||
#include "zlib/zutil.c"
|
||||
#undef Byte
|
||||
#else
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@
|
|||
|
||||
|
||||
//==============================================================================
|
||||
/** Writes data to an internal memory buffer, which grows as required.
|
||||
/**
|
||||
Writes data to an internal memory buffer, which grows as required.
|
||||
|
||||
The data that was written into the stream can then be accessed later as
|
||||
a contiguous block of memory.
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "zconf.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
//extern "C" {
|
||||
#endif
|
||||
|
||||
#define ZLIB_VERSION "1.2.3"
|
||||
|
|
@ -1352,7 +1352,7 @@ ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
|
|||
ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
//}
|
||||
#endif
|
||||
|
||||
#endif /* ZLIB_H */
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ BEGIN_JUCE_NAMESPACE
|
|||
#include "../io/streams/juce_MemoryInputStream.h"
|
||||
#include "../io/streams/juce_BufferedInputStream.h"
|
||||
#include "../core/juce_PlatformUtilities.h"
|
||||
#include "../core/juce_Initialisation.h"
|
||||
#include "../text/juce_LocalisedStrings.h"
|
||||
#include "../text/juce_XmlDocument.h"
|
||||
#include "../utilities/juce_DeletedAtShutdown.h"
|
||||
|
|
|
|||
|
|
@ -28,10 +28,6 @@
|
|||
#if JUCE_INCLUDED_FILE
|
||||
|
||||
//==============================================================================
|
||||
#if JUCE_DEBUG
|
||||
#define JUCE_DEBUG_XERRORS 1
|
||||
#endif
|
||||
|
||||
extern Display* display;
|
||||
extern Window juce_messageWindowHandle;
|
||||
|
||||
|
|
|
|||
|
|
@ -841,7 +841,7 @@ public:
|
|||
|
||||
while (! threadShouldExit())
|
||||
{
|
||||
const DWORD result = useExclusiveMode ? WaitForSingleObject (inputDevice->clientEvent, 1000)
|
||||
const DWORD result = useExclusiveMode ? (inputDevice != 0 ? WaitForSingleObject (inputDevice->clientEvent, 1000) : S_OK)
|
||||
: WaitForMultipleObjects (numEvents, events, true, 1000);
|
||||
if (result == WAIT_TIMEOUT)
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue