1
0
Fork 0
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 2009-08-17 17:15:09 +00:00
parent 9f4c4087dd
commit 335bdf6f1f
6 changed files with 861 additions and 904 deletions

View file

@ -1,13 +1,16 @@
==============================================================================
JUCE version 1.47
JUCE version 1.50
==============================================================================
Changelist for version 1.47
- changed the String::createStringFromData method to assume that an 8-bit file is utf-8 rather than the local ascii codepage.
Changelist for version 1.50
- It's been far too long since the last official release, and there are a vast number of new features and fixes in this version - far too many to list here! Check the SVN logs for more detailed information
- All Mac native code has been ported from Carbon to Cocoa. (There are a few exceptions, e.g. audio plugins, where Carbon support is still needed, but these remnants can easily be phased out in the future when no longer needed)
- Amalgamated builds: The entire Juce library can now be added to your application as a single (very large) cpp file! This can speed up builds (no need to build the juce library) and simplify project management, as well as making it easy to handle multiple juce projects that all need the library to be built with different settings.
- Support for browser plugins! In a similar way to building audio plugins, you can now build NPAPI and ActiveX browser plugins.
- Support for webcams! The CameraDevice class makes it easy to show a preview of a camera, and to stream its input to a video file.
==============================================================================
Changelist for version 1.46

View file

@ -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_get_IHDR (pngReadStruct, pngInfoStruct,
&width, &height,
&bitDepth, &colorType,
&interlaceType, 0, 0);
}
catch (...)
{
png_destroy_read_struct (&pngReadStruct, 0, 0);
return 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;
}
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);

View file

@ -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_get_IHDR (pngReadStruct, pngInfoStruct,
&width, &height,
&bitDepth, &colorType,
&interlaceType, 0, 0);
}
catch (...)
{
png_destroy_read_struct (&pngReadStruct, 0, 0);
return 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;
}
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);

View file

@ -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
}