gosu 0.7.47.1 → 0.7.48

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: 46f962dcbee435df36c0b90f2c9a7f0eb0697affd20202a9b3f0b74438cef81715a549d4f40922ee0fc6f54472d80a43dbb220610092b17bb16b79674f93d657
-  data.tar.gz: 65c994b275f5c0c3cbb131f5c9071ffa51f62a63123efa78cc945b90c5a4305135e77776caf29a63e822909bff6048b2ec333db5c68ff5f032be69395e0cb9c8
+  metadata.gz: 12757ae26d02d3cad60c1062c94d9a66d5ad2ecbfebea61eee6a3e92ec35127f4a60a89e536be7cc212962e0feb2d721a744f5a7f604db4682ce2fa532487e03
+  data.tar.gz: 83b6d27a97e32233878676f797275e593efd5946fe5e41c093937e20bb6767f969e257693b5df4fd071883aa7ed14b8a545567cd57bf199058b4a54b92503174
 SHA1: 
-  metadata.gz: 5717d9bb26797d0752706336725a51bb7d1569a0
-  data.tar.gz: 1ace5dbeaf66ffa54ae91e4767edf113d84035a3
+  metadata.gz: 4cc0bdd7ce334c6f0d65250719b6f44a3965eaf2
+  data.tar.gz: 1b6a3594dd5ab71455bec96cf0d345bcd0e4cc42

data/Gosu/ImageData.hpp

@@ -51,7 +51,8 @@ namespace Gosu
         virtual const GLTexInfo* glTexInfo() const = 0;
         virtual Bitmap toBitmap() const = 0;
         
-        //! Experimental and undocumented for now.
+        virtual std::auto_ptr<ImageData> subimage(int x, int y, int width, int height) const = 0;
+        
         virtual void insert(const Bitmap& bitmap, int x, int y) = 0;
     };
 }

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 47
-#define GOSU_VERSION "0.7.47.1"
+#define GOSU_POINT_VERSION 48
+#define GOSU_VERSION "0.7.48"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \
@@ -103,7 +103,7 @@
   "\n\n" \
   "  The precise terms and conditions for copying, distribution and" \
   "modification follow.  Pay close attention to the difference between a" \
-  "\n\n"work based on the library" and a "work that uses the library".  The" \
+  "\"work based on the library\" and a \"work that uses the library\".  The" \
   "former contains code derived from the library, while the latter only" \
   "works together with the library." \
   "\n\n" \
@@ -116,22 +116,22 @@
   "  0. This License Agreement applies to any software library which" \
   "contains a notice placed by the copyright holder or other authorized" \
   "party saying it may be distributed under the terms of this Library" \
-  "General Public License (also called "this License").  Each licensee is" \
-  "addressed as "you"." \
+  "General Public License (also called \"this License\").  Each licensee is" \
+  "addressed as \"you\"." \
   "\n\n" \
-  "  A "library" means a collection of software functions and/or data" \
+  "  A \"library\" means a collection of software functions and/or data" \
   "prepared so as to be conveniently linked with application programs" \
   "(which use some of those functions and data) to form executables." \
   "\n\n" \
-  "  The "Library", below, refers to any such software library or work" \
-  "which has been distributed under these terms.  A "work based on the" \
-  "Library" means either the Library or any derivative work under" \
+  "  The \"Library\", below, refers to any such software library or work" \
+  "which has been distributed under these terms.  A \"work based on the" \
+  "Library\" means either the Library or any derivative work under" \
   "copyright law: that is to say, a work containing the Library or a" \
   "portion of it, either verbatim or with modifications and/or translated" \
   "straightforwardly into another language.  (Hereinafter, translation is" \
-  "included without limitation in the term "modification".)" \
+  "included without limitation in the term \"modification\".)" \
   "\n\n" \
-  "  "Source code" for a work means the preferred form of the work for" \
+  "  \"Source code\" for a work means the preferred form of the work for" \
   "making modifications to it.  For a library, complete source code means" \
   "all the source code for all modules it contains, plus any associated" \
   "interface definition files, plus the scripts used to control compilation" \
@@ -237,17 +237,17 @@
   "\n\n" \
   "  5. A program that contains no derivative of any portion of the" \
   "Library, but is designed to work with the Library by being compiled or" \
-  "linked with it, is called a "work that uses the Library".  Such a" \
+  "linked with it, is called a \"work that uses the Library\".  Such a" \
   "work, in isolation, is not a derivative work of the Library, and" \
   "therefore falls outside the scope of this License." \
   "\n\n" \
-  "  However, linking a "work that uses the Library" with the Library" \
+  "  However, linking a \"work that uses the Library\" with the Library" \
   "creates an executable that is a derivative of the Library (because it" \
-  "contains portions of the Library), rather than a "work that uses the" \
-  "library".  The executable is therefore covered by this License." \
+  "contains portions of the Library), rather than a \"work that uses the" \
+  "library\".  The executable is therefore covered by this License." \
   "Section 6 states terms for distribution of such executables." \
   "\n\n" \
-  "  When a "work that uses the Library" uses material from a header file" \
+  "  When a \"work that uses the Library\" uses material from a header file" \
   "that is part of the Library, the object code for the work may be a" \
   "derivative work of the Library even though the source code is not." \
   "Whether this is true is especially significant if the work can be" \
@@ -267,7 +267,7 @@
   "whether or not they are linked directly with the Library itself." \
   "" \
   "  6. As an exception to the Sections above, you may also compile or" \
-  "link a "work that uses the Library" with the Library to produce a" \
+  "link a \"work that uses the Library\" with the Library to produce a" \
   "work containing portions of the Library, and distribute that work" \
   "under terms of your choice, provided that the terms permit" \
   "modification of the work for the customer's own use and reverse" \
@@ -285,8 +285,8 @@
   "    machine-readable source code for the Library including whatever" \
   "    changes were used in the work (which must be distributed under" \
   "    Sections 1 and 2 above); and, if the work is an executable linked" \
-  "    with the Library, with the complete machine-readable "work that" \
-  "    uses the Library", as object code and/or source code, so that the" \
+  "    with the Library, with the complete machine-readable \"work that" \
+  "    uses the Library\", as object code and/or source code, so that the" \
   "    user can modify the Library and then relink to produce a modified" \
   "    executable containing the modified Library.  (It is understood" \
   "    that the user who changes the contents of definitions files in the" \
@@ -305,8 +305,8 @@
   "    d) Verify that the user has already received a copy of these" \
   "    materials or that you have already sent this user a copy." \
   "\n\n" \
-  "  For an executable, the required form of the "work that uses the" \
-  "Library" must include any data and utility programs needed for" \
+  "  For an executable, the required form of the \"work that uses the" \
+  "Library\" must include any data and utility programs needed for" \
   "reproducing the executable from it.  However, as a special exception," \
   "the source code distributed need not include anything that is normally" \
   "distributed (in either source or binary form) with the major" \
@@ -407,7 +407,7 @@
   "\n\n" \
   "Each version is given a distinguishing version number.  If the Library" \
   "specifies a version number of this License which applies to it and" \
-  "\n\n"any later version", you have the option of following the terms and" \
+  "\"any later version\", you have the option of following the terms and" \
   "conditions either of that version or of any later version published by" \
   "the Free Software Foundation.  If the Library does not specify a" \
   "license version number, you may choose any version ever published by" \
@@ -427,7 +427,7 @@
   "  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO" \
   "WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW." \
   "EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR" \
-  "OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY" \
+  "OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY" \
   "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE" \
   "IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR" \
   "PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE" \
@@ -458,7 +458,7 @@
   "  To apply these terms, attach the following notices to the library.  It is" \
   "safest to attach them to the start of each source file to most effectively" \
   "convey the exclusion of warranty; and each file should have at least the" \
-  "\n\n"copyright" line and a pointer to where the full notice is found." \
+  "\"copyright\" line and a pointer to where the full notice is found." \
   "\n\n" \
   "    <one line to give the library's name and a brief idea of what it does.>" \
   "    Copyright (C) <year>  <name of author>" \
@@ -480,7 +480,7 @@
   "Also add information on how to contact you by electronic and paper mail." \
   "\n\n" \
   "You should also get your employer (if you work as a programmer) or your" \
-  "school, if any, to sign a "copyright disclaimer" for the library, if" \
+  "school, if any, to sign a \"copyright disclaimer\" for the library, if" \
   "necessary.  Here is a sample; alter the names:" \
   "\n\n" \
   "  Yoyodyne, Inc., hereby disclaims all copyright interest in the" \

data/GosuImpl/Audio/ALChannelManagement.hpp

@@ -2,7 +2,7 @@
 #ifdef GOSU_IS_MAC
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
-#include <GosuImpl/MacUtility.hpp>
+#include "../MacUtility.hpp"
 #else
 #include <AL/al.h>
 #include <AL/alc.h>

data/GosuImpl/Audio/AudioOpenAL.cpp

@@ -1,5 +1,5 @@
-#include <GosuImpl/Audio/ALChannelManagement.hpp>
-#include <GosuImpl/Audio/OggFile.hpp>
+#include "ALChannelManagement.hpp"
+#include "OggFile.hpp"
 
 #include <Gosu/Audio.hpp>
 #include <Gosu/Math.hpp>
@@ -18,12 +18,12 @@
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
 #import <Foundation/Foundation.h>
-#include <GosuImpl/Audio/AudioToolboxFile.hpp>
+#include "AudioToolboxFile.hpp"
 #define WAVE_FILE AudioToolboxFile
 #else
 #include <AL/al.h>
 #include <AL/alc.h>
-#include <GosuImpl/Audio/SndFile.hpp>
+#include "SndFile.hpp"
 #define WAVE_FILE SndFile
 #endif
 
@@ -57,7 +57,7 @@ namespace
 
 // TODO: What is the NSAutoreleasePool good for?
 #ifdef GOSU_IS_MAC
-#include <GosuImpl/MacUtility.hpp>
+#include "MacUtility.hpp"
     #define CONSTRUCTOR_COMMON \
         ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]); \
         if (!alChannelManagement.get()) \

data/GosuImpl/Audio/AudioOpenAL.mm

@@ -1 +1 @@
-#include <GosuImpl/Audio/AudioOpenAL.cpp>
+#include "AudioOpenAL.cpp"

data/GosuImpl/Audio/AudioToolboxFile.hpp

@@ -1,13 +1,13 @@
 #ifndef GOSU_AUDIO_AUDIOFILE_MAC_HPP
 #define GOSU_AUDIO_AUDIOFILE_MAC_HPP
 
-#include <GosuImpl/Audio/AudioFile.hpp>
+#include "AudioFile.hpp"
 #include <AudioToolbox/AudioToolbox.h>
 #include <AudioToolbox/AudioConverter.h>
 #include <AudioToolbox/ExtendedAudioFile.h>
 #include <OpenAL/al.h>
 #include <Gosu/IO.hpp>
-#include <GosuImpl/MacUtility.hpp>
+#include "MacUtility.hpp"
 #include <Gosu/Utility.hpp>
 #include <Gosu/Platform.hpp>
 #include <algorithm>

data/GosuImpl/Audio/OggFile.hpp

@@ -1,7 +1,7 @@
 #ifndef GOSUIMPL_AUDIO_OGGFILE_HPP
 #define GOSUIMPL_AUDIO_OGGFILE_HPP
 
-#include <GosuImpl/Audio/AudioFile.hpp>
+#include "AudioFile.hpp"
 #include <Gosu/IO.hpp>
 #include <vorbis/vorbisfile.h>
 #include <algorithm>

data/GosuImpl/DirectoriesMac.mm

@@ -1,5 +1,5 @@
 #import <Gosu/Directories.hpp>
-#import <GosuImpl/MacUtility.hpp>
+#import "MacUtility.hpp"
 #import <Gosu/Utility.hpp>
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSBundle.h>

data/GosuImpl/DirectoriesTouch.mm

@@ -1,6 +1,6 @@
 #import <Gosu/Directories.hpp>
 #import <Gosu/Utility.hpp>
-#import <GosuImpl/MacUtility.hpp>
+#import "MacUtility.hpp"
 #import <Foundation/Foundation.h>
 
 std::wstring Gosu::userSettingsPrefix()

data/GosuImpl/Graphics/BitmapApple.mm

@@ -4,7 +4,7 @@
 #include <Gosu/Platform.hpp>
 #include <Gosu/Utility.hpp>
 
-#include <GosuImpl/MacUtility.hpp>
+#include "MacUtility.hpp"
 #include <stdexcept>
 
 #ifdef GOSU_IS_IPHONE

data/GosuImpl/Graphics/BlockAllocator.cpp

@@ -1,4 +1,4 @@
-#include <GosuImpl/Graphics/BlockAllocator.hpp>
+#include "BlockAllocator.hpp"
 #include <stdexcept>
 #include <vector>
 
@@ -118,12 +118,17 @@ bool Gosu::BlockAllocator::alloc(unsigned aWidth, unsigned aHeight, Block& b)
     return false;
 }
 
-void Gosu::BlockAllocator::free(unsigned left, unsigned top)
+void Gosu::BlockAllocator::block(unsigned left, unsigned top, unsigned width, unsigned height)
+{
+    pimpl->blocks.push_back(Block(left, top, width, height));
+}
+
+void Gosu::BlockAllocator::free(unsigned left, unsigned top, unsigned width, unsigned height)
 {
     for (Impl::Blocks::iterator i = pimpl->blocks.begin();
         i != pimpl->blocks.end(); ++i)
     {
-        if (i->left == left && i->top == top)
+        if (i->left == left && i->top == top && i->width == width && i->height == height)
         {
             pimpl->blocks.erase(i);
 			// Be optimistic again!

data/GosuImpl/Graphics/BlockAllocator.hpp

@@ -26,7 +26,8 @@ namespace Gosu
         unsigned height() const;
 
         bool alloc(unsigned width, unsigned height, Block& block);
-        void free(unsigned left, unsigned top);
+        void block(unsigned left, unsigned top, unsigned width, unsigned height);
+        void free(unsigned left, unsigned top, unsigned width, unsigned height);
     };
 }
 

data/GosuImpl/Graphics/ClipRectStack.hpp

@@ -1,7 +1,7 @@
 #ifndef GOSUIMPL_GRAPHICS_CLIPRECTSTACK_HPP
 #define GOSUIMPL_GRAPHICS_CLIPRECTSTACK_HPP
 
-#include <GosuImpl/Graphics/Common.hpp>
+#include "Common.hpp"
 #include <cassert>
 #include <vector>
 

data/GosuImpl/Graphics/DrawOp.hpp

@@ -3,9 +3,9 @@
 
 #include <Gosu/GraphicsBase.hpp>
 #include <Gosu/Color.hpp>
-#include <GosuImpl/Graphics/Common.hpp>
-#include <GosuImpl/Graphics/RenderState.hpp>
-#include <GosuImpl/Graphics/TexChunk.hpp>
+#include "Common.hpp"
+#include "RenderState.hpp"
+#include "TexChunk.hpp"
 #include <cassert>
 
 namespace Gosu

data/GosuImpl/Graphics/DrawOpQueue.hpp

@@ -2,10 +2,10 @@
 #define GOSUIMPL_GRAPHICS_DRAWOPQUEUE_HPP
 
 #include <Gosu/TR1.hpp>
-#include <GosuImpl/Graphics/Common.hpp>
-#include <GosuImpl/Graphics/TransformStack.hpp>
-#include <GosuImpl/Graphics/ClipRectStack.hpp>
-#include <GosuImpl/Graphics/DrawOp.hpp>
+#include "Common.hpp"
+#include "TransformStack.hpp"
+#include "ClipRectStack.hpp"
+#include "DrawOp.hpp"
 #include <cassert>
 #include <algorithm>
 #include <map>

data/GosuImpl/Graphics/Font.cpp

@@ -4,8 +4,8 @@
 #include <Gosu/Math.hpp>
 #include <Gosu/Text.hpp>
 #include <Gosu/TR1.hpp>
-#include <GosuImpl/Graphics/Common.hpp>
-#include <GosuImpl/Graphics/FormattedString.hpp>
+#include "Common.hpp"
+#include "FormattedString.hpp"
 #include <cassert>
 #include <map>
 using namespace std;

data/GosuImpl/Graphics/GosuView.mm

@@ -3,8 +3,8 @@
 #import <UIKit/UIKit.h>
 
 #import <Gosu/Graphics.hpp>
-#import <GosuImpl/Graphics/Common.hpp>
-#import <GosuImpl/Graphics/GosuView.hpp>
+#import "Common.hpp"
+#import "GosuView.hpp"
 
 Gosu::Window& windowInstance();
 

data/GosuImpl/Graphics/Graphics.cpp

@@ -1,10 +1,10 @@
 #include <Gosu/Graphics.hpp>
-#include <GosuImpl/Graphics/Common.hpp>
-#include <GosuImpl/Graphics/DrawOp.hpp>
-#include <GosuImpl/Graphics/Texture.hpp>
-#include <GosuImpl/Graphics/TexChunk.hpp>
-#include <GosuImpl/Graphics/LargeImageData.hpp>
-#include <GosuImpl/Graphics/Macro.hpp>
+#include "Common.hpp"
+#include "DrawOp.hpp"
+#include "Texture.hpp"
+#include "TexChunk.hpp"
+#include "LargeImageData.hpp"
+#include "Macro.hpp"
 #include <Gosu/Bitmap.hpp>
 #include <Gosu/Image.hpp>
 #include <Gosu/Platform.hpp>
@@ -16,8 +16,7 @@
 #include <limits>
 
 #ifdef GOSU_IS_IPHONE
-#import <UIKit/UIKit.h>
-#include <GosuImpl/Orientation.hpp>
+#include "../Orientation.hpp"
 #endif
 
 struct Gosu::Graphics::Impl

data/GosuImpl/Graphics/Image.cpp

@@ -4,6 +4,7 @@
 #include <Gosu/ImageData.hpp>
 #include <Gosu/Math.hpp>
 #include <Gosu/IO.hpp>
+#include <stdexcept>
 
 Gosu::Image::Image(Graphics& graphics, const std::wstring& filename, bool tileable)
 {
@@ -40,6 +41,8 @@ Gosu::Image::Image(Graphics& graphics, const Bitmap& source,
 Gosu::Image::Image(std::auto_ptr<ImageData> data)
 :   data(data.release())
 {
+    if (this->data.get() == 0)
+        throw std::invalid_argument("Gosu::Image cannot be initialized with an ImageData null pointer");
 }
 
 unsigned Gosu::Image::width() const

data/GosuImpl/Graphics/LargeImageData.cpp

@@ -1,5 +1,5 @@
-#include <GosuImpl/Graphics/LargeImageData.hpp>
-#include <GosuImpl/Graphics/Common.hpp>
+#include "LargeImageData.hpp"
+#include "Common.hpp"
 #include <Gosu/Bitmap.hpp>
 #include <Gosu/Graphics.hpp>
 #include <Gosu/Math.hpp>

data/GosuImpl/Graphics/LargeImageData.hpp

@@ -4,6 +4,7 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/ImageData.hpp>
 #include <Gosu/TR1.hpp>
+#include <stdexcept>
 #include <vector>
 
 namespace Gosu
@@ -31,6 +32,11 @@ namespace Gosu
             return 0;
         }
         
+        std::auto_ptr<ImageData> subimage(int x, int y, int w, int h) const
+        {
+            return std::auto_ptr<ImageData>();
+        }
+        
         Bitmap toBitmap() const;
         void insert(const Bitmap& bitmap, int x, int y);
     };

data/GosuImpl/Graphics/Macro.hpp

@@ -4,8 +4,8 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/ImageData.hpp>
 #include <Gosu/TR1.hpp>
-#include <GosuImpl/Graphics/Common.hpp>
-#include <GosuImpl/Graphics/DrawOpQueue.hpp>
+#include "Common.hpp"
+#include "DrawOpQueue.hpp"
 #include <cmath>
 #include <algorithm>
 #include <memory>
@@ -227,6 +227,11 @@ public:
         throw std::logic_error("Gosu::Macro cannot be rendered as Gosu::Bitmap yet");
     }
     
+    std::auto_ptr<ImageData> subimage(int x, int y, int width, int height) const
+    {
+        return std::auto_ptr<ImageData>();
+    }
+    
     void insert(const Bitmap& bitmap, int x, int y)
     {
         throw std::logic_error("Gosu::Macro cannot be updated with a Gosu::Bitmap yet");