[Scummvm-cvs-logs] scummvm master -> 7be486ae271ff87e1f7b3d3a5b9b0596826c6cc1

lordhoto lordhoto at gmail.com
Tue Mar 8 20:15:46 CET 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
693f8dc295 SCI: Add missing namespace comments in graphics/.
7be486ae27 SCI: Slight template formatting fixes.


Commit: 693f8dc295dc43e3bccd954a8a243f7aedd5da22
    https://github.com/scummvm/scummvm/commit/693f8dc295dc43e3bccd954a8a243f7aedd5da22
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-08T20:13:05+01:00

Commit Message:
SCI: Add missing namespace comments in graphics/.

Changed paths:
    engines/sci/graphics/celobj32.cpp
    engines/sci/graphics/celobj32.h
    engines/sci/graphics/lists32.h
    engines/sci/graphics/palette32.cpp
    engines/sci/graphics/palette32.h
    engines/sci/graphics/plane32.cpp
    engines/sci/graphics/plane32.h
    engines/sci/graphics/screen_item32.cpp
    engines/sci/graphics/screen_item32.h



diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 79b1bb6..35f9348 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -1036,4 +1036,4 @@ CelObjColor *CelObjColor::duplicate() const {
 byte *CelObjColor::getResPointer() const {
 	error("Unsupported method");
 }
-}
+} // End of namespace Sci
diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h
index 1422b76..eca8935 100644
--- a/engines/sci/graphics/celobj32.h
+++ b/engines/sci/graphics/celobj32.h
@@ -577,6 +577,6 @@ public:
 	virtual CelObjColor *duplicate() const override;
 	virtual byte *getResPointer() const override;
 };
-}
+} // End of namespace Sci
 
 #endif
diff --git a/engines/sci/graphics/lists32.h b/engines/sci/graphics/lists32.h
index bb990e1..7e94eb1 100644
--- a/engines/sci/graphics/lists32.h
+++ b/engines/sci/graphics/lists32.h
@@ -188,5 +188,5 @@ public:
 	}
 };
 
-}
+} // End of namespace Sci
 #endif
diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index a26564e..82e8d77 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/palette32.cpp
@@ -819,4 +819,4 @@ void GfxPalette32::applyFade() {
 	}
 }
 
-}
+} // End of namespace Sci
diff --git a/engines/sci/graphics/palette32.h b/engines/sci/graphics/palette32.h
index 9d39cac..b8388d1 100644
--- a/engines/sci/graphics/palette32.h
+++ b/engines/sci/graphics/palette32.h
@@ -278,6 +278,6 @@ public:
 	void applyFade();
 };
 
-}
+} // End of namespace Sci
 
 #endif
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index d955632..4487070 100644
--- a/engines/sci/graphics/plane32.cpp
+++ b/engines/sci/graphics/plane32.cpp
@@ -882,4 +882,4 @@ void PlaneList::remove_at(size_type index) {
 	delete PlaneListBase::remove_at(index);
 }
 
-}
+} // End of namespace Sci
diff --git a/engines/sci/graphics/plane32.h b/engines/sci/graphics/plane32.h
index d3427f1..d844919 100644
--- a/engines/sci/graphics/plane32.h
+++ b/engines/sci/graphics/plane32.h
@@ -466,6 +466,6 @@ public:
 	void remove_at(size_type index);
 };
 
-}
+} // End of namespace Sci
 
 #endif
diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp
index 138a0e4..4a42221 100644
--- a/engines/sci/graphics/screen_item32.cpp
+++ b/engines/sci/graphics/screen_item32.cpp
@@ -527,4 +527,4 @@ void ScreenItemList::unsort() {
 	}
 }
 
-}
+} // End of namespace Sci
diff --git a/engines/sci/graphics/screen_item32.h b/engines/sci/graphics/screen_item32.h
index 06e1f60..52782ac 100644
--- a/engines/sci/graphics/screen_item32.h
+++ b/engines/sci/graphics/screen_item32.h
@@ -276,6 +276,6 @@ public:
 	void sort();
 	void unsort();
 };
-}
+} // End of namespace Sci
 
 #endif


Commit: 7be486ae271ff87e1f7b3d3a5b9b0596826c6cc1
    https://github.com/scummvm/scummvm/commit/7be486ae271ff87e1f7b3d3a5b9b0596826c6cc1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-08T20:15:22+01:00

Commit Message:
SCI: Slight template formatting fixes.

Changed paths:
    engines/sci/graphics/celobj32.cpp
    engines/sci/graphics/celobj32.h
    engines/sci/graphics/lists32.h



diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 35f9348..389270e 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -107,7 +107,7 @@ void CelObj::deinit() {
 #pragma mark -
 #pragma mark CelObj - Scalers
 
-template <bool FLIP, typename READER>
+template<bool FLIP, typename READER>
 struct SCALER_NoScale {
 	const byte *_row;
 	READER _reader;
@@ -562,7 +562,7 @@ void CelObj::putCopyInCache(const int cacheIndex) const {
 #pragma mark -
 #pragma mark CelObj - Drawing
 
-template <typename MAPPER, typename SCALER>
+template<typename MAPPER, typename SCALER>
 struct RENDERER {
 	MAPPER &_mapper;
 	SCALER &_scaler;
@@ -594,7 +594,7 @@ struct RENDERER {
 	}
 };
 
-template <typename MAPPER, typename SCALER>
+template<typename MAPPER, typename SCALER>
 void CelObj::render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition) const {
 
 	MAPPER mapper;
@@ -603,7 +603,7 @@ void CelObj::render(Buffer &target, const Common::Rect &targetRect, const Common
 	renderer.draw(target, targetRect, scaledPosition);
 }
 
-template <typename MAPPER, typename SCALER>
+template<typename MAPPER, typename SCALER>
 void CelObj::render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition, const Ratio &scaleX, const Ratio &scaleY) const {
 
 	MAPPER mapper;
diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h
index eca8935..8d030cf 100644
--- a/engines/sci/graphics/celobj32.h
+++ b/engines/sci/graphics/celobj32.h
@@ -379,10 +379,10 @@ public:
 #pragma mark -
 #pragma mark CelObj - Drawing
 private:
-	template <typename MAPPER, typename SCALER>
+	template<typename MAPPER, typename SCALER>
 	void render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition) const;
 
-	template <typename MAPPER, typename SCALER>
+	template<typename MAPPER, typename SCALER>
 	void render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition, const Ratio &scaleX, const Ratio &scaleY) const;
 
 	void drawHzFlip(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition) const;
diff --git a/engines/sci/graphics/lists32.h b/engines/sci/graphics/lists32.h
index 7e94eb1..4f74c77 100644
--- a/engines/sci/graphics/lists32.h
+++ b/engines/sci/graphics/lists32.h
@@ -36,7 +36,7 @@ namespace Sci {
  * calling `erase` or when destroying the
  * StablePointerArray.
  */
-template <class T, uint N>
+template<class T, uint N>
 class StablePointerArray {
 	uint _size;
 	T *_items[N];
@@ -178,7 +178,7 @@ public:
 	}
 };
 
-template <typename T>
+template<typename T>
 class FindByObject {
 	const reg_t &_object;
 public:






More information about the Scummvm-git-logs mailing list