Fixed #3043, which was listed as a ShowImage bug but really was a bug in
several translators which used the incorrect MIME type for the base Be Bitmap Format. Please when adding translators use image/x-be-bitmap, not just x-be-bitmap. Though I suppose the if statement in ShowImage could be changed to only look for x-be-bitmap at the end of the string when filtering, I think this is the proper fix. While I was editing the translators I also made the naming more consistant by adding the translator name in parenthesis after Be Bitmap Format for those that did not have it. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28487 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -34,8 +34,8 @@ translation_format sOutputFormats[] = {
|
|||||||
B_TRANSLATOR_BITMAP,
|
B_TRANSLATOR_BITMAP,
|
||||||
BITS_OUT_QUALITY,
|
BITS_OUT_QUALITY,
|
||||||
BITS_OUT_CAPABILITY,
|
BITS_OUT_CAPABILITY,
|
||||||
"x-be-bitmap",
|
"image/x-be-bitmap",
|
||||||
"Be Bitmap image"
|
"Be Bitmap Format (EXRTranslator)"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -46,13 +46,13 @@ int32 translatorVersion = 0x140;
|
|||||||
|
|
||||||
translation_format inputFormats[] = {
|
translation_format inputFormats[] = {
|
||||||
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
|
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
|
||||||
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap image" },
|
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap Format (GIFTranslator)" },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
translation_format outputFormats[] = {
|
translation_format outputFormats[] = {
|
||||||
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
|
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
|
||||||
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap image" },
|
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap Format (GIFTranslator)" },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -156,7 +156,7 @@ Identify(BPositionIO *inSource, const translation_format *inFormat,
|
|||||||
outInfo->type = B_TRANSLATOR_BITMAP;
|
outInfo->type = B_TRANSLATOR_BITMAP;
|
||||||
outInfo->quality = 0.3;
|
outInfo->quality = 0.3;
|
||||||
outInfo->capability = 0.3;
|
outInfo->capability = 0.3;
|
||||||
strcpy(outInfo->name, "Be Bitmap image");
|
strcpy(outInfo->name, "Be Bitmap Format (GIFTranslator)");
|
||||||
strcpy(outInfo->MIME, "image/x-be-bitmap");
|
strcpy(outInfo->MIME, "image/x-be-bitmap");
|
||||||
}
|
}
|
||||||
return B_OK;
|
return B_OK;
|
||||||
|
|||||||
@@ -60,8 +60,8 @@ translation_format sOutputFormats[] = {
|
|||||||
B_TRANSLATOR_BITMAP,
|
B_TRANSLATOR_BITMAP,
|
||||||
BITS_OUT_QUALITY,
|
BITS_OUT_QUALITY,
|
||||||
BITS_OUT_CAPABILITY,
|
BITS_OUT_CAPABILITY,
|
||||||
"x-be-bitmap",
|
"image/x-be-bitmap",
|
||||||
"Be Bitmap image"
|
"Be Bitmap Format (HPGSTranslator)"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ translation_format sInputFormats[] = {
|
|||||||
B_TRANSLATOR_BITMAP,
|
B_TRANSLATOR_BITMAP,
|
||||||
BITS_IN_QUALITY,
|
BITS_IN_QUALITY,
|
||||||
BITS_IN_CAPABILITY,
|
BITS_IN_CAPABILITY,
|
||||||
"x-be-bitmap",
|
"images/x-be-bitmap",
|
||||||
"Be Bitmap image"
|
"Be Bitmap Format (ICOTranslator)"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -55,8 +55,8 @@ translation_format sOutputFormats[] = {
|
|||||||
B_TRANSLATOR_BITMAP,
|
B_TRANSLATOR_BITMAP,
|
||||||
BITS_OUT_QUALITY,
|
BITS_OUT_QUALITY,
|
||||||
BITS_OUT_CAPABILITY,
|
BITS_OUT_CAPABILITY,
|
||||||
"x-be-bitmap",
|
"images/x-be-bitmap",
|
||||||
"Be Bitmap image"
|
"Be Bitmap Format (ICOTranslator)"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
|
|
||||||
// The translation kit's native file type
|
// The translation kit's native file type
|
||||||
#define B_TRANSLATOR_BITMAP_MIME_STRING "image/x-be-bitmap"
|
#define B_TRANSLATOR_BITMAP_MIME_STRING "image/x-be-bitmap"
|
||||||
#define B_TRANSLATOR_BITMAP_DESCRIPTION "Be Bitmap image"
|
#define B_TRANSLATOR_BITMAP_DESCRIPTION "Be Bitmap Format (JPEGTranslator)"
|
||||||
|
|
||||||
// Translation Kit required globals
|
// Translation Kit required globals
|
||||||
char translatorName[] = "JPEG Images";
|
char translatorName[] = "JPEG Images";
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
|
|
||||||
// The translation kit's native file type
|
// The translation kit's native file type
|
||||||
#define B_TRANSLATOR_BITMAP_MIME_STRING "image/x-be-bitmap"
|
#define B_TRANSLATOR_BITMAP_MIME_STRING "image/x-be-bitmap"
|
||||||
#define B_TRANSLATOR_BITMAP_DESCRIPTION "Be Bitmap image"
|
#define B_TRANSLATOR_BITMAP_DESCRIPTION "Be Bitmap Format (JPEG2000Translator)"
|
||||||
|
|
||||||
// Translation Kit required globals
|
// Translation Kit required globals
|
||||||
char translatorName[] = "JPEG2000 Images";
|
char translatorName[] = "JPEG2000 Images";
|
||||||
|
|||||||
@@ -32,8 +32,8 @@ translation_format sInputFormats[] = {
|
|||||||
B_TRANSLATOR_BITMAP,
|
B_TRANSLATOR_BITMAP,
|
||||||
BITS_IN_QUALITY,
|
BITS_IN_QUALITY,
|
||||||
BITS_IN_CAPABILITY,
|
BITS_IN_CAPABILITY,
|
||||||
"x-be-bitmap",
|
"image/x-be-bitmap",
|
||||||
"Be Bitmap image"
|
"Be Bitmap Format (PCXTranslator)"
|
||||||
},*/
|
},*/
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -52,8 +52,8 @@ translation_format sOutputFormats[] = {
|
|||||||
B_TRANSLATOR_BITMAP,
|
B_TRANSLATOR_BITMAP,
|
||||||
BITS_OUT_QUALITY,
|
BITS_OUT_QUALITY,
|
||||||
BITS_OUT_CAPABILITY,
|
BITS_OUT_CAPABILITY,
|
||||||
"x-be-bitmap",
|
"image/x-be-bitmap",
|
||||||
"Be Bitmap image"
|
"Be Bitmap Format (PCXTranslator)"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -62,13 +62,13 @@ int32 translatorVersion = PPM_TRANSLATOR_VERSION;
|
|||||||
|
|
||||||
/* These two data arrays are a really good idea to export from Translators, but not required. */
|
/* These two data arrays are a really good idea to export from Translators, but not required. */
|
||||||
translation_format inputFormats[] = {
|
translation_format inputFormats[] = {
|
||||||
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.4, 0.8, "image/x-be-bitmap", "Be Bitmap image" },
|
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.4, 0.8, "image/x-be-bitmap", "Be Bitmap Format (PPMTranslator)" },
|
||||||
{ PPM_TYPE, B_TRANSLATOR_BITMAP, 0.3, 0.8, "image/x-portable-pixmap", "PPM image" },
|
{ PPM_TYPE, B_TRANSLATOR_BITMAP, 0.3, 0.8, "image/x-portable-pixmap", "PPM image" },
|
||||||
{ 0, 0, 0, 0, "\0", "\0" }
|
{ 0, 0, 0, 0, "\0", "\0" }
|
||||||
}; /* optional (else Identify is always called) */
|
}; /* optional (else Identify is always called) */
|
||||||
|
|
||||||
translation_format outputFormats[] = {
|
translation_format outputFormats[] = {
|
||||||
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.4, 0.8, "image/x-be-bitmap", "Be Bitmap image" },
|
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.4, 0.8, "image/x-be-bitmap", "Be Bitmap Format (PPMTranslator)" },
|
||||||
{ PPM_TYPE, B_TRANSLATOR_BITMAP, 0.3, 0.8, "image/x-portable-pixmap", "PPM image" },
|
{ PPM_TYPE, B_TRANSLATOR_BITMAP, 0.3, 0.8, "image/x-portable-pixmap", "PPM image" },
|
||||||
{ 0, 0, 0, 0, "\0", "\0" }
|
{ 0, 0, 0, 0, "\0", "\0" }
|
||||||
}; /* optional (else Translate is called anyway) */
|
}; /* optional (else Translate is called anyway) */
|
||||||
@@ -269,7 +269,7 @@ Identify( /* required */
|
|||||||
outInfo->type = B_TRANSLATOR_BITMAP;
|
outInfo->type = B_TRANSLATOR_BITMAP;
|
||||||
outInfo->quality = 0.4; /* B_TRANSLATOR_BITMAP can do alpha, at least */
|
outInfo->quality = 0.4; /* B_TRANSLATOR_BITMAP can do alpha, at least */
|
||||||
outInfo->capability = 0.8; /* and we might not know many variations thereof */
|
outInfo->capability = 0.8; /* and we might not know many variations thereof */
|
||||||
strcpy(outInfo->name, "Be Bitmap image");
|
strcpy(outInfo->name, "Be Bitmap Format (PPMTranslator)");
|
||||||
strcpy(outInfo->MIME, "image/x-be-bitmap"); /* this is the MIME type of B_TRANSLATOR_BITMAP */
|
strcpy(outInfo->MIME, "image/x-be-bitmap"); /* this is the MIME type of B_TRANSLATOR_BITMAP */
|
||||||
}
|
}
|
||||||
return B_OK;
|
return B_OK;
|
||||||
|
|||||||
@@ -71,8 +71,8 @@ translation_format sOutputFormats[] = {
|
|||||||
B_TRANSLATOR_BITMAP,
|
B_TRANSLATOR_BITMAP,
|
||||||
BITS_OUT_QUALITY,
|
BITS_OUT_QUALITY,
|
||||||
BITS_OUT_CAPABILITY,
|
BITS_OUT_CAPABILITY,
|
||||||
"x-be-bitmap",
|
"image/x-be-bitmap",
|
||||||
"Be Bitmap image"
|
"Be Bitmap Format (RAWTranslator)"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user