mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
minor tidying up
This commit is contained in:
jules
parent
9f4c4087dd
commit
335bdf6f1f
6 changed files with 861 additions and 904 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,20 +1,20 @@
|
|||
|
||||
/*
|
||||
This file includes the entire juce source tree via the amalgamated file.
|
||||
|
||||
You could add the amalgamated file directly to your project, but doing it
|
||||
like this allows you to put your app's config settings in the
|
||||
juce_AppConfig.h file and have them applied to both the juce headers and
|
||||
the source code.
|
||||
*/
|
||||
|
||||
#include "juce_AppConfig.h"
|
||||
|
||||
// This is where all the juce code gets included, via this amalgamated file..
|
||||
#include "../../../../juce_amalgamated.mm"
|
||||
|
||||
/* NB. A handy tip is that if you're doing a lot of debugging into the juce code, then stepping through
|
||||
the amalgamated file can be slow or impossible for the debugger. But if you use the following line
|
||||
instead of the one above, then it makes it a lot easier..
|
||||
*/
|
||||
//#include "../../../../src/juce_amalgamated_template.cpp"
|
||||
|
||||
/*
|
||||
This file includes the entire juce source tree via the amalgamated file.
|
||||
|
||||
You could add the amalgamated file directly to your project, but doing it
|
||||
like this allows you to put your app's config settings in the
|
||||
juce_AppConfig.h file and have them applied to both the juce headers and
|
||||
the source code.
|
||||
*/
|
||||
|
||||
#include "juce_AppConfig.h"
|
||||
|
||||
// This is where all the juce code gets included, via this amalgamated file..
|
||||
#include "../../../../juce_amalgamated.mm"
|
||||
|
||||
/* NB. A handy tip is that if you're doing a lot of debugging into the juce code, then stepping through
|
||||
the amalgamated file can be slow or impossible for the debugger. But if you use the following line
|
||||
instead of the one above, then it makes it a lot easier..
|
||||
*/
|
||||
//#include "../../../../src/juce_amalgamated_template.cpp"
|
||||
|
|
|
|||
|
|
@ -1,73 +1,73 @@
|
|||
/*
|
||||
==============================================================================
|
||||
|
||||
This file is part of the JUCE library - "Jules' Utility Class Extensions"
|
||||
Copyright 2004-7 by Raw Material Software ltd.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
JUCE can be redistributed and/or modified under the terms of the
|
||||
GNU General Public License, as published by the Free Software Foundation;
|
||||
either version 2 of the License, or (at your option) any later version.
|
||||
|
||||
JUCE is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with JUCE; if not, visit www.gnu.org/licenses or write to the
|
||||
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||||
Boston, MA 02111-1307 USA
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
If you'd like to release a closed-source product which uses JUCE, commercial
|
||||
licenses are also available: visit www.rawmaterialsoftware.com/juce for
|
||||
more information.
|
||||
|
||||
==============================================================================
|
||||
*/
|
||||
|
||||
/*
|
||||
This file contains settings that you might want to explicitly apply to
|
||||
your Juce build.
|
||||
|
||||
These flags enable or disable juce features - if you're linking to juce as
|
||||
a library, then to change them, you'd need to alter your juce_Config.h file and
|
||||
recompile the juce lib. But because we're using the amalgamated file, you can
|
||||
just include this file before including your juce_amalgamated.cpp file to
|
||||
have the same effect.
|
||||
|
||||
If you leave any of these commented-out, they'll take on the default value
|
||||
assigned to them in juce_Config.h, so to force them on or off, just set them
|
||||
to an explicit 0 or 1 in here.
|
||||
*/
|
||||
|
||||
//#define JUCE_ONLY_BUILD_CORE_LIBRARY 1
|
||||
//#define JUCE_FORCE_DEBUG 1
|
||||
//#define JUCE_LOG_ASSERTIONS 1
|
||||
//#define JUCE_ASIO 1
|
||||
//#define JUCE_ALSA 1
|
||||
#ifdef _MSC_VER
|
||||
#define JUCE_QUICKTIME 0 // (This is disabled here by default because on windows it requires the QT SDK,
|
||||
// but you can turn it on again if you've got the SDK)
|
||||
#endif
|
||||
|
||||
#define JUCE_OPENGL 1
|
||||
//#define JUCE_USE_FLAC 1
|
||||
//#define JUCE_USE_OGGVORBIS 1
|
||||
//#define JUCE_USE_CDBURNER 1
|
||||
//#define JUCE_ENABLE_REPAINT_DEBUGGING 1
|
||||
//#define JUCE_USE_XINERAMA 1
|
||||
//#define JUCE_USE_XSHM 1
|
||||
#define JUCE_PLUGINHOST_VST 0
|
||||
#define JUCE_PLUGINHOST_AU 0
|
||||
|
||||
#ifndef LINUX
|
||||
#define JUCE_USE_CAMERA 1
|
||||
#endif
|
||||
|
||||
//#define JUCE_CHECK_MEMORY_LEAKS 1
|
||||
//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1
|
||||
//#define JUCE_STRINGS_ARE_UNICODE 1
|
||||
/*
|
||||
==============================================================================
|
||||
|
||||
This file is part of the JUCE library - "Jules' Utility Class Extensions"
|
||||
Copyright 2004-7 by Raw Material Software ltd.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
JUCE can be redistributed and/or modified under the terms of the
|
||||
GNU General Public License, as published by the Free Software Foundation;
|
||||
either version 2 of the License, or (at your option) any later version.
|
||||
|
||||
JUCE is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with JUCE; if not, visit www.gnu.org/licenses or write to the
|
||||
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||||
Boston, MA 02111-1307 USA
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
If you'd like to release a closed-source product which uses JUCE, commercial
|
||||
licenses are also available: visit www.rawmaterialsoftware.com/juce for
|
||||
more information.
|
||||
|
||||
==============================================================================
|
||||
*/
|
||||
|
||||
/*
|
||||
This file contains settings that you might want to explicitly apply to
|
||||
your Juce build.
|
||||
|
||||
These flags enable or disable juce features - if you're linking to juce as
|
||||
a library, then to change them, you'd need to alter your juce_Config.h file and
|
||||
recompile the juce lib. But because we're using the amalgamated file, you can
|
||||
just include this file before including your juce_amalgamated.cpp file to
|
||||
have the same effect.
|
||||
|
||||
If you leave any of these commented-out, they'll take on the default value
|
||||
assigned to them in juce_Config.h, so to force them on or off, just set them
|
||||
to an explicit 0 or 1 in here.
|
||||
*/
|
||||
|
||||
//#define JUCE_ONLY_BUILD_CORE_LIBRARY 1
|
||||
//#define JUCE_FORCE_DEBUG 1
|
||||
//#define JUCE_LOG_ASSERTIONS 1
|
||||
//#define JUCE_ASIO 1
|
||||
//#define JUCE_ALSA 1
|
||||
#ifdef _MSC_VER
|
||||
#define JUCE_QUICKTIME 0 // (This is disabled here by default because on windows it requires the QT SDK,
|
||||
// but you can turn it on again if you've got the SDK)
|
||||
#endif
|
||||
|
||||
#define JUCE_OPENGL 1
|
||||
//#define JUCE_USE_FLAC 1
|
||||
//#define JUCE_USE_OGGVORBIS 1
|
||||
//#define JUCE_USE_CDBURNER 1
|
||||
//#define JUCE_ENABLE_REPAINT_DEBUGGING 1
|
||||
//#define JUCE_USE_XINERAMA 1
|
||||
//#define JUCE_USE_XSHM 1
|
||||
#define JUCE_PLUGINHOST_VST 0
|
||||
#define JUCE_PLUGINHOST_AU 0
|
||||
|
||||
#ifndef LINUX
|
||||
#define JUCE_USE_CAMERA 1
|
||||
#endif
|
||||
|
||||
//#define JUCE_CHECK_MEMORY_LEAKS 1
|
||||
//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1
|
||||
//#define JUCE_STRINGS_ARE_UNICODE 1
|
||||
|
|
|
|||
|
|
@ -95310,8 +95310,6 @@ local block_state deflate_rle(s, flush)
|
|||
#endif
|
||||
/********* End of inlined file: deflate.c *********/
|
||||
|
||||
//#include "zlib/infback.c"
|
||||
|
||||
/********* Start of inlined file: inffast.c *********/
|
||||
|
||||
/********* Start of inlined file: inftrees.h *********/
|
||||
|
|
@ -98890,8 +98888,6 @@ local void copy_block(deflate_state *s,
|
|||
}
|
||||
/********* End of inlined file: trees.c *********/
|
||||
|
||||
//#include "zlib/uncompr.c"
|
||||
|
||||
/********* Start of inlined file: zutil.c *********/
|
||||
/* @(#) $Id: zutil.c,v 1.1 2007/06/07 17:54:37 jules_rms Exp $ */
|
||||
|
||||
|
|
@ -230659,20 +230655,12 @@ Image* juce_loadPNGImageFromStream (InputStream& in) throw()
|
|||
png_uint_32 width, height;
|
||||
int bitDepth, colorType, interlaceType;
|
||||
|
||||
try
|
||||
{
|
||||
png_read_info (pngReadStruct, pngInfoStruct);
|
||||
png_read_info (pngReadStruct, pngInfoStruct);
|
||||
|
||||
png_get_IHDR (pngReadStruct, pngInfoStruct,
|
||||
&width, &height,
|
||||
&bitDepth, &colorType,
|
||||
&interlaceType, 0, 0);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
png_destroy_read_struct (&pngReadStruct, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
png_get_IHDR (pngReadStruct, pngInfoStruct,
|
||||
&width, &height,
|
||||
&bitDepth, &colorType,
|
||||
&interlaceType, 0, 0);
|
||||
|
||||
if (bitDepth == 16)
|
||||
png_set_strip_16 (pngReadStruct);
|
||||
|
|
@ -230702,24 +230690,12 @@ Image* juce_loadPNGImageFromStream (InputStream& in) throw()
|
|||
for (y = (int) height; --y >= 0;)
|
||||
rows[y] = (png_bytep) (tempBuffer + (width << 2) * y);
|
||||
|
||||
bool crashed = false;
|
||||
|
||||
try
|
||||
{
|
||||
png_read_image (pngReadStruct, rows);
|
||||
png_read_end (pngReadStruct, pngInfoStruct);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
crashed = true;
|
||||
}
|
||||
png_read_image (pngReadStruct, rows);
|
||||
png_read_end (pngReadStruct, pngInfoStruct);
|
||||
|
||||
juce_free (rows);
|
||||
png_destroy_read_struct (&pngReadStruct, &pngInfoStruct, 0);
|
||||
|
||||
if (crashed)
|
||||
return 0;
|
||||
|
||||
// now convert the data to a juce image format..
|
||||
image = new Image (hasAlphaChan ? Image::ARGB : Image::RGB,
|
||||
width, height, hasAlphaChan);
|
||||
|
|
|
|||
|
|
@ -156,20 +156,12 @@ Image* juce_loadPNGImageFromStream (InputStream& in) throw()
|
|||
png_uint_32 width, height;
|
||||
int bitDepth, colorType, interlaceType;
|
||||
|
||||
try
|
||||
{
|
||||
png_read_info (pngReadStruct, pngInfoStruct);
|
||||
png_read_info (pngReadStruct, pngInfoStruct);
|
||||
|
||||
png_get_IHDR (pngReadStruct, pngInfoStruct,
|
||||
&width, &height,
|
||||
&bitDepth, &colorType,
|
||||
&interlaceType, 0, 0);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
png_destroy_read_struct (&pngReadStruct, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
png_get_IHDR (pngReadStruct, pngInfoStruct,
|
||||
&width, &height,
|
||||
&bitDepth, &colorType,
|
||||
&interlaceType, 0, 0);
|
||||
|
||||
if (bitDepth == 16)
|
||||
png_set_strip_16 (pngReadStruct);
|
||||
|
|
@ -199,24 +191,12 @@ Image* juce_loadPNGImageFromStream (InputStream& in) throw()
|
|||
for (y = (int) height; --y >= 0;)
|
||||
rows[y] = (png_bytep) (tempBuffer + (width << 2) * y);
|
||||
|
||||
bool crashed = false;
|
||||
|
||||
try
|
||||
{
|
||||
png_read_image (pngReadStruct, rows);
|
||||
png_read_end (pngReadStruct, pngInfoStruct);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
crashed = true;
|
||||
}
|
||||
png_read_image (pngReadStruct, rows);
|
||||
png_read_end (pngReadStruct, pngInfoStruct);
|
||||
|
||||
juce_free (rows);
|
||||
png_destroy_read_struct (&pngReadStruct, &pngInfoStruct, 0);
|
||||
|
||||
if (crashed)
|
||||
return 0;
|
||||
|
||||
// now convert the data to a juce image format..
|
||||
image = new Image (hasAlphaChan ? Image::ARGB : Image::RGB,
|
||||
width, height, hasAlphaChan);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ namespace zlibNamespace
|
|||
#undef DO8
|
||||
#include "zlib/crc32.c"
|
||||
#include "zlib/deflate.c"
|
||||
//#include "zlib/infback.c"
|
||||
#include "zlib/inffast.c"
|
||||
#undef PULLBYTE
|
||||
#undef LOAD
|
||||
|
|
@ -64,7 +63,6 @@ namespace zlibNamespace
|
|||
#include "zlib/inflate.c"
|
||||
#include "zlib/inftrees.c"
|
||||
#include "zlib/trees.c"
|
||||
//#include "zlib/uncompr.c"
|
||||
#include "zlib/zutil.c"
|
||||
#undef Byte
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue