diff --git a/src/add-ons/translators/psd/PSDLoader.cpp b/src/add-ons/translators/psd/PSDLoader.cpp
index d1830223fd..f6ea17f97e 100644
--- a/src/add-ons/translators/psd/PSDLoader.cpp
+++ b/src/add-ons/translators/psd/PSDLoader.cpp
@@ -113,10 +113,10 @@ PSDLoader::ColorFormatName(void)
 }
 
 
-int32
+psd_color_format
 PSDLoader::_ColorFormat(void)
 {
-	int32 format = PSD_COLOR_FORMAT_UNSUPPORTED;
+	psd_color_format format = PSD_COLOR_FORMAT_UNSUPPORTED;
 	if (!fLoaded)
 		return format;
 
@@ -159,7 +159,7 @@ PSDLoader::_ColorFormat(void)
 }
 
 
-int
+status_t
 PSDLoader::Decode(BPositionIO *target)
 {
 	if (!IsSupported())
@@ -235,7 +235,7 @@ PSDLoader::Decode(BPositionIO *target)
 	
 	uint8 *lineData = new uint8[fWidth * sizeof(uint32)];
 	
-	int32 colorFormat = _ColorFormat();
+	psd_color_format colorFormat = _ColorFormat();
 	
 	switch (colorFormat) {
 		case PSD_COLOR_FORMAT_GRAY_8:
diff --git a/src/add-ons/translators/psd/PSDLoader.h b/src/add-ons/translators/psd/PSDLoader.h
index 01bcdb2073..bcc677a768 100644
--- a/src/add-ons/translators/psd/PSDLoader.h
+++ b/src/add-ons/translators/psd/PSDLoader.h
@@ -59,7 +59,7 @@ public:
 					PSDLoader(BPositionIO *stream);
 					~PSDLoader();
 		
-	int 			Decode(BPositionIO *target);
+	status_t		Decode(BPositionIO *target);
 	bool			IsLoaded(void);
 	bool			IsSupported(void);
 	
@@ -72,7 +72,7 @@ private:
 	int8			_GetInt8FromStream(BPositionIO *in);
 	void			_SkipStreamBlock(BPositionIO *in, size_t count);
 	
-	int32			_ColorFormat(void);
+	psd_color_format _ColorFormat(void);
 
 	BPositionIO 	*fStream;
 	uint8			*fStreamBuffer;