Browse Source

Minor clean-ups.

tags/2021-05-28
jules 12 years ago
parent
commit
6b6c4a3eab
3 changed files with 15 additions and 20 deletions
  1. +6
    -6
      modules/juce_core/time/juce_RelativeTime.cpp
  2. +6
    -6
      modules/juce_core/time/juce_RelativeTime.h
  3. +3
    -8
      modules/juce_graphics/image_formats/juce_PNGLoader.cpp

+ 6
- 6
modules/juce_core/time/juce_RelativeTime.cpp View File

@@ -28,12 +28,12 @@ RelativeTime::RelativeTime (const RelativeTime& other) noexcept : seconds (oth
RelativeTime::~RelativeTime() noexcept {}
//==============================================================================
const RelativeTime RelativeTime::milliseconds (const int milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); }
const RelativeTime RelativeTime::milliseconds (const int64 milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); }
const RelativeTime RelativeTime::minutes (const double numberOfMinutes) noexcept { return RelativeTime (numberOfMinutes * 60.0); }
const RelativeTime RelativeTime::hours (const double numberOfHours) noexcept { return RelativeTime (numberOfHours * (60.0 * 60.0)); }
const RelativeTime RelativeTime::days (const double numberOfDays) noexcept { return RelativeTime (numberOfDays * (60.0 * 60.0 * 24.0)); }
const RelativeTime RelativeTime::weeks (const double numberOfWeeks) noexcept { return RelativeTime (numberOfWeeks * (60.0 * 60.0 * 24.0 * 7.0)); }
RelativeTime RelativeTime::milliseconds (const int milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); }
RelativeTime RelativeTime::milliseconds (const int64 milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); }
RelativeTime RelativeTime::minutes (const double numberOfMinutes) noexcept { return RelativeTime (numberOfMinutes * 60.0); }
RelativeTime RelativeTime::hours (const double numberOfHours) noexcept { return RelativeTime (numberOfHours * (60.0 * 60.0)); }
RelativeTime RelativeTime::days (const double numberOfDays) noexcept { return RelativeTime (numberOfDays * (60.0 * 60.0 * 24.0)); }
RelativeTime RelativeTime::weeks (const double numberOfWeeks) noexcept { return RelativeTime (numberOfWeeks * (60.0 * 60.0 * 24.0 * 7.0)); }
//==============================================================================
int64 RelativeTime::inMilliseconds() const noexcept { return (int64) (seconds * 1000.0); }


+ 6
- 6
modules/juce_core/time/juce_RelativeTime.h View File

@@ -61,32 +61,32 @@ public:
/** Creates a new RelativeTime object representing a number of milliseconds.
@see minutes, hours, days, weeks
*/
static const RelativeTime milliseconds (int milliseconds) noexcept;
static RelativeTime milliseconds (int milliseconds) noexcept;
/** Creates a new RelativeTime object representing a number of milliseconds.
@see minutes, hours, days, weeks
*/
static const RelativeTime milliseconds (int64 milliseconds) noexcept;
static RelativeTime milliseconds (int64 milliseconds) noexcept;
/** Creates a new RelativeTime object representing a number of minutes.
@see milliseconds, hours, days, weeks
*/
static const RelativeTime minutes (double numberOfMinutes) noexcept;
static RelativeTime minutes (double numberOfMinutes) noexcept;
/** Creates a new RelativeTime object representing a number of hours.
@see milliseconds, minutes, days, weeks
*/
static const RelativeTime hours (double numberOfHours) noexcept;
static RelativeTime hours (double numberOfHours) noexcept;
/** Creates a new RelativeTime object representing a number of days.
@see milliseconds, minutes, hours, weeks
*/
static const RelativeTime days (double numberOfDays) noexcept;
static RelativeTime days (double numberOfDays) noexcept;
/** Creates a new RelativeTime object representing a number of weeks.
@see milliseconds, minutes, hours, days
*/
static const RelativeTime weeks (double numberOfWeeks) noexcept;
static RelativeTime weeks (double numberOfWeeks) noexcept;
//==============================================================================
/** Returns the number of milliseconds this time represents.


+ 3
- 8
modules/juce_graphics/image_formats/juce_PNGLoader.cpp View File

@@ -160,16 +160,11 @@ Image PNGImageFormat::decodeImage (InputStream& in)
using namespace pnglibNamespace;
Image image;
png_structp pngReadStruct;
png_infop pngInfoStruct;
pngReadStruct = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
if (pngReadStruct != nullptr)
if (png_structp pngReadStruct = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0))
{
try
{
pngInfoStruct = png_create_info_struct (pngReadStruct);
png_infop pngInfoStruct = png_create_info_struct (pngReadStruct);
if (pngInfoStruct == nullptr)
{
@@ -177,7 +172,7 @@ Image PNGImageFormat::decodeImage (InputStream& in)
return Image::null;
}
png_set_error_fn (pngReadStruct, 0, PNGHelpers::errorCallback, PNGHelpers::errorCallback );
png_set_error_fn (pngReadStruct, 0, PNGHelpers::errorCallback, PNGHelpers::errorCallback);
// read the header..
png_set_read_fn (pngReadStruct, &in, PNGHelpers::readCallback);


Loading…
Cancel
Save