C++ cleanup.

votchallenge · Oct 27, 2016 · 9b6e530 · 9b6e530
1 parent dfad734
commit 9b6e530
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/trax.cpp b/lib/trax.cpp
@@ -83,11 +83,11 @@ Wrapper::~Wrapper() {
 
 }
 
-void Wrapper::swap(Wrapper& lhs) throw() {
+void Wrapper::swap(Wrapper& lhs) {
 	std::swap(pn, lhs.pn);
 }
 
-long Wrapper::claims() throw() {
+long Wrapper::claims() const {
 	long count = 0;
 	if (NULL != pn)
 	{
@@ -103,7 +103,7 @@ void Wrapper::acquire() {
 		++(*pn);
 }
 
-void Wrapper::release() throw() {
+void Wrapper::release() {
 	if (NULL != pn) {
 		--(*pn);
 		if (0 == *pn) {
@@ -379,6 +379,7 @@ void  Region::set(float x, float y, float width, float height)  {
 }
 
 void  Region::get(float* x, float* y, float* width, float* height) const {
+	if (empty()) return;
 
 	trax_region_get_rectangle(region, x, y, width, height);
 }

diff --git a/lib/trax.h b/lib/trax.h
@@ -495,9 +495,9 @@ class __TRAX_EXPORT Wrapper {
 
     Wrapper(const Wrapper& count);
 
-    void swap(Wrapper& lhs) throw();
+    void swap(Wrapper& lhs);
 
-    long claims() throw();
+    long claims() const;
 
     /**
      * Call after the wrapped pointer has been created or copied to increase
@@ -509,7 +509,7 @@ class __TRAX_EXPORT Wrapper {
      * Call instead of releasing memory to decrease reference count. If the 
      * reference count comes to zero then cleanup() is called.
     **/
-    void release() throw();
+    void release();
 
     virtual void cleanup() = 0;