Merge lp:~lfroen/stellarium/stellarium-iphone into lp:stellarium

[Froenchenko Leonid]

If texture image already loaded, use it to determine texture size.

[Fabien Chéreau (xalioth)]

ok.

[Fabien Chéreau (xalioth)]

Merged + fixed a bit style.

=== modified file 'src/core/StelTexture.cpp'
--- src/core/StelTexture.cpp	2010-04-15 13:54:32 +0000
+++ src/core/StelTexture.cpp	2010-08-14 15:35:52 +0000
@@ -195,15 +195,20 @@
 {
 	if (width<0 || height<0)
 	{
-		// Try to get the size from the file without loading data
-		QImageReader im(fullPath);
-		if (!im.canRead())
-		{
-			return false;
+		if ( !qImage.isNull() ) {
+			width = qImage.width();
+			height = qImage.height();
+		} else {
+			// Try to get the size from the file without loading data
+			QImageReader im(fullPath);
+			if (!im.canRead())
+			{
+				return false;
+			}
+			QSize size = im.size();
+			width = size.width();
+			height = size.height();
 		}
-		QSize size = im.size();
-		width = size.width();
-		height = size.height();
 	}
 	awidth = width;
 	aheight = height;