From 07b40ad301f456d847f3873bdb88d5e3d023ee2a Mon Sep 17 00:00:00 2001 From: "tor%cs.brown.edu" Date: Mon, 17 Dec 2001 22:07:03 +0000 Subject: [PATCH] Bug 66976 - turn on libpr0n MNG decoder. r=pavlov, sr=brendan. Mac build patch by conrad, r=pinkerton, sr=sfraser git-svn-id: svn://10.0.0.236/trunk@110639 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/allmakefiles.sh | 1 + .../mac/build_scripts/MozillaBuildList.pm | 9 +- mozilla/content/build/nsContentDLF.cpp | 2 + mozilla/layout/build/nsContentDLF.cpp | 2 + mozilla/layout/generic/nsObjectFrame.cpp | 10 +- .../layout/html/base/src/nsObjectFrame.cpp | 10 +- mozilla/mailnews/mime/src/mimei.cpp | 4 +- mozilla/modules/libpr0n/decoders/Makefile.in | 2 +- mozilla/modules/libpr0n/decoders/makefile.win | 2 +- .../modules/libpr0n/macbuild/mngdecoder.xml | 2200 +++++++++++++++++ mozilla/modules/libpr0n/src/imgRequest.cpp | 18 + mozilla/netwerk/mime/public/nsMimeTypes.h | 2 + .../netwerk/mime/src/nsXMLMIMEDataSource.cpp | 6 + .../converters/nsUnknownDecoder.cpp | 18 + .../exthandler/nsExternalHelperAppService.cpp | 2 + .../xpfe/browser/src/nsBrowserInstance.cpp | 10 + mozilla/xpinstall/packager/packages-mac | 1 + mozilla/xpinstall/packager/packages-unix | 1 + mozilla/xpinstall/packager/packages-win | 1 + 19 files changed, 2291 insertions(+), 10 deletions(-) create mode 100644 mozilla/modules/libpr0n/macbuild/mngdecoder.xml diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index 76c8aa58ebb..2b6681db2d3 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -803,6 +803,7 @@ fi modules/libpr0n/decoders/ppm/Makefile modules/libpr0n/decoders/jpeg/Makefile modules/libpr0n/decoders/bmp/Makefile + modules/libpr0n/decoders/mng/Makefile " MAKEFILES_gfx2=" diff --git a/mozilla/build/mac/build_scripts/MozillaBuildList.pm b/mozilla/build/mac/build_scripts/MozillaBuildList.pm index c6b6eeaecd9..aa2b45f25e8 100644 --- a/mozilla/build/mac/build_scripts/MozillaBuildList.pm +++ b/mozilla/build/mac/build_scripts/MozillaBuildList.pm @@ -625,6 +625,7 @@ sub BuildClientDist() #LIBIMAGE InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST", "$distdirectory:libimg:"); + InstallFromManifest(":mozilla:modules:libimg:mng:MANIFEST", "$distdirectory:libimg:"); if ($main::options{useimg2}) { #GFX2 @@ -1366,12 +1367,15 @@ sub BuildImglibProjects() StartBuildModule("imglib"); BuildProject(":mozilla:jpeg:macbuild:JPEG.xml", "JPEG$D.o"); + MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.o", ":mozilla:dist:libimg:"); BuildProject(":mozilla:modules:libimg:macbuild:png.xml", "png$D.o"); + MakeAlias(":mozilla:modules:libimg:macbuild:png$D.o", ":mozilla:dist:libimg:"); # MNG if ($main::options{mng}) { - BuildProject(":mozilla:modules:libimg:macbuild:mng.xml", "mng$D.o"); + BuildProject(":mozilla:modules:libimg:macbuild:mng.xml", "mng$D.o"); + MakeAlias(":mozilla:modules:libimg:macbuild:mng$D.o", ":mozilla:dist:libimg:"); } EndBuildModule("imglib"); @@ -1405,8 +1409,7 @@ sub BuildImglib2Projects() # MNG if ($main::options{mng}) { - #BuildProject(":mozilla:modules:libimg:macbuild:mng.mcp", "mng$D.o", 0, 0, 0); - #BuildOneProject(":mozilla:modules:libimg:macbuild:mngdecoder.mcp", "mngdecoder$D.$S", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:modules:libpr0n:macbuild:mngdecoder.xml", "mngdecoder$D.$S", 1, $main::ALIAS_SYM_FILES, 1); } } diff --git a/mozilla/content/build/nsContentDLF.cpp b/mozilla/content/build/nsContentDLF.cpp index de286eeed49..f8a08dc722d 100644 --- a/mozilla/content/build/nsContentDLF.cpp +++ b/mozilla/content/build/nsContentDLF.cpp @@ -130,6 +130,8 @@ static const char* const gImageTypes[] = { "image/x-jg", "image/bmp", "image/x-icon", + "video/x-mng", + "image/x-jng", 0 }; diff --git a/mozilla/layout/build/nsContentDLF.cpp b/mozilla/layout/build/nsContentDLF.cpp index de286eeed49..f8a08dc722d 100644 --- a/mozilla/layout/build/nsContentDLF.cpp +++ b/mozilla/layout/build/nsContentDLF.cpp @@ -130,6 +130,8 @@ static const char* const gImageTypes[] = { "image/x-jg", "image/bmp", "image/x-icon", + "video/x-mng", + "image/x-jng", 0 }; diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 0d5c751cc4b..be4b772b55d 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -383,6 +383,8 @@ nsObjectFrame::GetSkipSides() const #define IMAGE_EXT_XBM "xbm" #define IMAGE_EXT_BMP "bmp" #define IMAGE_EXT_ICO "ico" +#define IMAGE_EXT_MNG "mng" +#define IMAGE_EXT_JNG "jng" // #define DO_DIRTY_INTERSECT 1 // enable dirty rect intersection during paint @@ -407,7 +409,9 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) type.EqualsIgnoreCase(IMAGE_XBM2)|| type.EqualsIgnoreCase(IMAGE_XBM3)|| type.EqualsIgnoreCase(IMAGE_BMP) || - type.EqualsIgnoreCase(IMAGE_ICO)) + type.EqualsIgnoreCase(IMAGE_ICO) || + type.EqualsIgnoreCase(IMAGE_MNG) || + type.EqualsIgnoreCase(IMAGE_JNG)) { *aImage = PR_TRUE; } @@ -442,7 +446,9 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) ext.EqualsIgnoreCase(IMAGE_EXT_PNG) || ext.EqualsIgnoreCase(IMAGE_EXT_XBM) || ext.EqualsIgnoreCase(IMAGE_EXT_BMP) || - ext.EqualsIgnoreCase(IMAGE_EXT_ICO)) + ext.EqualsIgnoreCase(IMAGE_EXT_ICO) || + ext.EqualsIgnoreCase(IMAGE_EXT_MNG) || + ext.EqualsIgnoreCase(IMAGE_EXT_JNG)) { *aImage = PR_TRUE; } diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 0d5c751cc4b..be4b772b55d 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -383,6 +383,8 @@ nsObjectFrame::GetSkipSides() const #define IMAGE_EXT_XBM "xbm" #define IMAGE_EXT_BMP "bmp" #define IMAGE_EXT_ICO "ico" +#define IMAGE_EXT_MNG "mng" +#define IMAGE_EXT_JNG "jng" // #define DO_DIRTY_INTERSECT 1 // enable dirty rect intersection during paint @@ -407,7 +409,9 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) type.EqualsIgnoreCase(IMAGE_XBM2)|| type.EqualsIgnoreCase(IMAGE_XBM3)|| type.EqualsIgnoreCase(IMAGE_BMP) || - type.EqualsIgnoreCase(IMAGE_ICO)) + type.EqualsIgnoreCase(IMAGE_ICO) || + type.EqualsIgnoreCase(IMAGE_MNG) || + type.EqualsIgnoreCase(IMAGE_JNG)) { *aImage = PR_TRUE; } @@ -442,7 +446,9 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) ext.EqualsIgnoreCase(IMAGE_EXT_PNG) || ext.EqualsIgnoreCase(IMAGE_EXT_XBM) || ext.EqualsIgnoreCase(IMAGE_EXT_BMP) || - ext.EqualsIgnoreCase(IMAGE_EXT_ICO)) + ext.EqualsIgnoreCase(IMAGE_EXT_ICO) || + ext.EqualsIgnoreCase(IMAGE_EXT_MNG) || + ext.EqualsIgnoreCase(IMAGE_EXT_JNG)) { *aImage = PR_TRUE; } diff --git a/mozilla/mailnews/mime/src/mimei.cpp b/mozilla/mailnews/mime/src/mimei.cpp index c8fbb72b1cf..21467f6c469 100644 --- a/mozilla/mailnews/mime/src/mimei.cpp +++ b/mozilla/mailnews/mime/src/mimei.cpp @@ -450,7 +450,9 @@ mime_find_class (const char *content_type, MimeHeaders *hdrs, !nsCRT::strcasecmp(content_type, IMAGE_XBM2) || !nsCRT::strcasecmp(content_type, IMAGE_XBM3) || !nsCRT::strcasecmp(content_type, IMAGE_BMP) || - !nsCRT::strcasecmp(content_type, IMAGE_ICO)) + !nsCRT::strcasecmp(content_type, IMAGE_ICO) || + !nsCRT::strcasecmp(content_type, IMAGE_MNG) || + !nsCRT::strcasecmp(content_type, IMAGE_JNG)) clazz = (MimeObjectClass *)&mimeInlineImageClass; #ifdef ENABLE_SMIME diff --git a/mozilla/modules/libpr0n/decoders/Makefile.in b/mozilla/modules/libpr0n/decoders/Makefile.in index c1f036a883c..e7db281d744 100644 --- a/mozilla/modules/libpr0n/decoders/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = ppm png gif jpeg bmp +DIRS = ppm png gif jpeg bmp mng include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/libpr0n/decoders/makefile.win b/mozilla/modules/libpr0n/decoders/makefile.win index 903d62ef2f0..636dece97c3 100644 --- a/mozilla/modules/libpr0n/decoders/makefile.win +++ b/mozilla/modules/libpr0n/decoders/makefile.win @@ -21,6 +21,6 @@ DEPTH=..\..\.. -DIRS = ppm gif png jpeg icon\win icon bmp +DIRS = ppm gif png jpeg icon\win icon bmp mng !include $(DEPTH)\config\rules.mak diff --git a/mozilla/modules/libpr0n/macbuild/mngdecoder.xml b/mozilla/modules/libpr0n/macbuild/mngdecoder.xml new file mode 100644 index 00000000000..9b31ab6fd70 --- /dev/null +++ b/mozilla/modules/libpr0n/macbuild/mngdecoder.xml @@ -0,0 +1,2200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + mngdecoderDebug.shlb + + + + UserSourceTrees + + + AlwaysSearchUserPathsfalse + InterpretDOSAndUnixPathsfalse + RequireFrameworkStyleIncludesfalse + UserSearchPaths + + SearchPath + Path:: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::::dist: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SystemSearchPaths + + SearchPath + Path:MSL: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path:MacOS Support: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + FrameworkPathfalse + HostFlagsMacOS + + + + + MWRuntimeSettings_WorkingDirectory + MWRuntimeSettings_CommandLine + MWRuntimeSettings_HostApplication + Path + PathFormatGeneric + PathRootAbsolute + + MWRuntimeSettings_EnvVars + + + LinkerMacOS PPC Linker + PreLinker + PostLinker + TargetnamemngdecoderDebug.shlb + OutputDirectory + Path: + PathFormatMacOS + PathRootProject + + SaveEntriesUsingRelativePathsfalse + + + FileMappings + + FileTypeAPPL + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeAppl + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeMMLB + FileExtension + CompilerLib Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMPLF + FileExtension + CompilerLib Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMWCD + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeRSRC + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.bh + CompilerBalloon Help + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c++ + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cc + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cp + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cpp + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.exp + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.h + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileTypeTEXT + FileExtension.p + CompilerMW Pascal PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pas + CompilerMW Pascal PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch++ + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.r + CompilerRez + EditLanguageRez + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.s + CompilerPPCAsm + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeXCOF + FileExtension + CompilerXCOFF Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypedocu + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypersrc + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeshlb + FileExtension + CompilerPEF Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypestub + FileExtension + CompilerPEF Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.doc + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMaketrue + + + + + CacheModDatesfalse + ActivateBrowsertrue + DumpBrowserInfofalse + CacheSubprojectstrue + UseThirdPartyDebuggerfalse + DebuggerAppPath + Path + PathFormatGeneric + PathRootAbsolute + + DebuggerCmdLineArgs + DebuggerWorkingDir + Path + PathFormatGeneric + PathRootAbsolute + + + + LogSystemMessagestrue + AutoTargetDLLsfalse + StopAtWatchpointstrue + PauseWhileRunningfalse + PauseInterval5 + PauseUIFlags0 + AltExePath + Path + PathFormatGeneric + PathRootAbsolute + + StopAtTempBPOnLaunchtrue + CacheSymbolicstrue + TempBPFunctionNamemain + TempBPType0 + + + Enabledfalse + ConnectionName + DownloadPath + LaunchRemoteAppfalse + RemoteAppPath + + + OtherExecutables + + + CustomColor1 + Red0 + Green39321 + Blue0 + + CustomColor2 + Red0 + Green32767 + Blue0 + + CustomColor3 + Red0 + Green32767 + Blue0 + + CustomColor4 + Red0 + Green32767 + Blue0 + + + + MWFrontEnd_C_cplusplus0 + MWFrontEnd_C_checkprotos0 + MWFrontEnd_C_arm0 + MWFrontEnd_C_trigraphs0 + MWFrontEnd_C_onlystdkeywords0 + MWFrontEnd_C_enumsalwaysint1 + MWFrontEnd_C_mpwpointerstyle0 + MWFrontEnd_C_prefixnameMacPrefix_debug.h + MWFrontEnd_C_ansistrict0 + MWFrontEnd_C_mpwcnewline0 + MWFrontEnd_C_wchar_type1 + MWFrontEnd_C_enableexceptions1 + MWFrontEnd_C_dontreusestrings0 + MWFrontEnd_C_poolstrings0 + MWFrontEnd_C_dontinline0 + MWFrontEnd_C_useRTTI0 + MWFrontEnd_C_multibyteaware0 + MWFrontEnd_C_unsignedchars0 + MWFrontEnd_C_autoinline0 + MWFrontEnd_C_booltruefalse0 + MWFrontEnd_C_direct_to_som0 + MWFrontEnd_C_som_env_check0 + MWFrontEnd_C_alwaysinline0 + MWFrontEnd_C_inlinelevel0 + MWFrontEnd_C_ecplusplus0 + MWFrontEnd_C_objective_c0 + MWFrontEnd_C_defer_codegen0 + + + MWWarning_C_warn_illpragma1 + MWWarning_C_warn_emptydecl1 + MWWarning_C_warn_possunwant1 + MWWarning_C_warn_unusedvar1 + MWWarning_C_warn_unusedarg0 + MWWarning_C_warn_extracomma1 + MWWarning_C_pedantic1 + MWWarning_C_warningerrors0 + MWWarning_C_warn_hidevirtual1 + MWWarning_C_warn_implicitconv0 + MWWarning_C_warn_notinlined0 + MWWarning_C_warn_structclass0 + + + MWFTP_Post_hostName + MWFTP_Post_username + MWFTP_Post_password0 + MWFTP_Post_remoteDir + MWFTP_Post_ftp_PathVersion0 + MWFTP_Post_ftp_PathType0 + MWFTP_Post_ftp_PathFormat0 + MWFTP_Post_ftp_tree + MWFTP_Post_uploadDir + MWFTP_Post_ftp_port21 + MWFTP_Post_SendBin1 + MWFTP_Post_ShouldLog1 + + + MWCommandLine_Java_clsName + MWCommandLine_Java_args + + + MWVJavaDebugging_Protocol1 + MWVJavaDebugging_JDKVersion1 + MWVJavaDebugging_TimeOut10 + MWVJavaDebugging_SupportSlowDevicesfalse + + + MWJava_Language_optimizefalse + MWJava_Language_warnDeprecatedfalse + MWJava_Language_emitMapfalse + MWJava_Language_strictFileNamesfalse + MWJava_Language_strictFileHierarchyfalse + MWJava_Language_1_1_Compatiblefalse + MWJava_Language_emitHeaders0 + MWJava_Language_headerTypeJNINativeHeaders + MWJava_Language_packageFilter + MWJava_Language_genCommentstrue + MWJava_Language_genHeadersfalse + + + MWJava_MRJAppBuilder_outFileMRJApplication + MWJava_MRJAppBuilder_mergefalse + MWJava_MRJAppBuilder_quitMenutrue + MWJava_MRJAppBuilder_growfalse + MWJava_MRJAppBuilder_stdoutTypeConsole + MWJava_MRJAppBuilder_stderrTypeConsole + MWJava_MRJAppBuilder_stdinTypeConsole + MWJava_MRJAppBuilder_appIconPVersion0 + MWJava_MRJAppBuilder_appIconPType0 + MWJava_MRJAppBuilder_appIconPFormat0 + MWJava_MRJAppBuilder_appIconPTree + MWJava_MRJAppBuilder_appIconFile + MWJava_MRJAppBuilder_splashScreenPVersion0 + MWJava_MRJAppBuilder_splashScreenPType0 + MWJava_MRJAppBuilder_splashScreenPFormat0 + MWJava_MRJAppBuilder_splashScreenPTree + MWJava_MRJAppBuilder_splashScreenPICTFile + MWJava_MRJAppBuilder_aboutName + MWJava_MRJAppBuilder_stdoutPVersion0 + MWJava_MRJAppBuilder_stdoutPType0 + MWJava_MRJAppBuilder_stdoutPFormat0 + MWJava_MRJAppBuilder_stdoutPTree + MWJava_MRJAppBuilder_stdoutFile + MWJava_MRJAppBuilder_stdoutAppendfalse + MWJava_MRJAppBuilder_stderrPType0 + MWJava_MRJAppBuilder_stderrPFormat0 + MWJava_MRJAppBuilder_stderrPTree + MWJava_MRJAppBuilder_stderrFile + MWJava_MRJAppBuilder_stderrAppendfalse + MWJava_MRJAppBuilder_stdinPType0 + MWJava_MRJAppBuilder_stdinPFormat0 + MWJava_MRJAppBuilder_stdinPTree + MWJava_MRJAppBuilder_stdinFile + + + MWJava_Output_outputtypeJarFile + MWJava_Output_outfileJavaClasses.jar + MWJava_Output_ftype1514754080 + MWJava_Output_fcreator1297570384 + MWJava_Output_compress0 + MWJava_Output_genManifest0 + MWJava_Output_trunctypeFront + MWJava_Output_deleteClasses0 + MWJava_Output_consoleApp1 + + + MWJava_Proj_projtypeApplet + MWJava_Proj_mainClassName + MWJava_Proj_HTMLAppCreator1463898714 + MWJava_Proj_HTMLAppName + MWJava_Proj_PathVersion0 + MWJava_Proj_PathType0 + MWJava_Proj_PathFormat0 + MWJava_Proj_tree + MWJava_Proj_HTMLAppWin32Name + MWJava_Proj_compress0 + MWJava_Proj_useVM1 + MWJava_Proj_vmarguments + MWJava_Proj_vmName + MWJava_Proj_simPropFile + + + MWJavaDoc_Proj_Version1 + MWJavaDoc_Proj_Depricated1 + MWJavaDoc_Proj_Author1 + MWJavaDoc_Proj_Index1 + MWJavaDoc_Proj_Tree1 + MWJavaDoc_Proj_SunResolveToSame0 + MWJavaDoc_Proj_Shortnames1 + MWJavaDoc_Proj_Folder0 + MWJavaDoc_Proj_GenerateAPILinks0 + MWJavaDoc_Proj_scopePublic + MWJavaDoc_Proj_fcreator1297303877 + MWJavaDoc_Proj_encodingName + MWJavaDoc_Proj_decodingName + MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ + + + MWMerge_MacOS_projectTypeApplication + MWMerge_MacOS_outputNameMerge Out + MWMerge_MacOS_outputCreator???? + MWMerge_MacOS_outputTypeAPPL + MWMerge_MacOS_suppressWarning0 + MWMerge_MacOS_copyFragments1 + MWMerge_MacOS_copyResources1 + MWMerge_MacOS_flattenResource0 + MWMerge_MacOS_flatFileNamea.rsrc + MWMerge_MacOS_flatFileOutputPath + Path: + PathFormatMacOS + PathRootProject + + MWMerge_MacOS_skipResources + DLGX + ckid + Proj + WSPC + + + + FileLockedfalse + ResourcesMapIsReadOnlyfalse + PrinterDriverIsMultiFinderCompatiblefalse + Invisiblefalse + HasBundlefalse + NameLockedfalse + Stationeryfalse + HasCustomIconfalse + Sharedfalse + HasBeenInitedfalse + Label0 + Comments + + + MWMacOSPackager_UsePackager0 + MWMacOSPackager_FolderToPackage + Path: + PathFormatMacOS + PathRootProject + + MWMacOSPackager_CreateClassicAlias0 + MWMacOSPackager_ClassicAliasMethodUseTargetOutput + MWMacOSPackager_ClassicAliasPath + Path: + PathFormatMacOS + PathRootProject + + MWMacOSPackager_CreatePkgInfo0 + MWMacOSPackager_PkgCreatorType???? + MWMacOSPackager_PkgFileTypeAPPL + + + MWCodeGen_PPC_structalignmentPPC + MWCodeGen_PPC_tracebacktablesInline + MWCodeGen_PPC_processorGeneric + MWCodeGen_PPC_readonlystrings1 + MWCodeGen_PPC_tocdata1 + MWCodeGen_PPC_profiler0 + MWCodeGen_PPC_fpcontract1 + MWCodeGen_PPC_schedule0 + MWCodeGen_PPC_peephole0 + MWCodeGen_PPC_processorspecific0 + MWCodeGen_PPC_altivec0 + MWCodeGen_PPC_vectortocdata0 + MWCodeGen_PPC_vrsave0 + + + MWCodeGen_MachO_structalignmentPPC + MWCodeGen_MachO_tracebacktablesNone + MWCodeGen_MachO_processorGeneric + MWCodeGen_MachO_readonlystrings0 + MWCodeGen_MachO_profiler0 + MWCodeGen_MachO_fpcontract1 + MWCodeGen_MachO_schedule0 + MWCodeGen_MachO_peephole1 + MWCodeGen_MachO_processorspecific0 + MWCodeGen_MachO_altivec0 + MWCodeGen_MachO_vrsave1 + MWCodeGen_MachO_common0 + MWCodeGen_MachO_implicit_templates1 + + + MWDisassembler_PPC_showcode1 + MWDisassembler_PPC_extended1 + MWDisassembler_PPC_mix0 + MWDisassembler_PPC_nohex0 + MWDisassembler_PPC_showdata1 + MWDisassembler_PPC_showexceptions1 + MWDisassembler_PPC_showsym0 + MWDisassembler_PPC_shownames1 + + + GlobalOptimizer_PPC_optimizationlevelLevel0 + GlobalOptimizer_PPC_optforSpeed + + + MWLinker_PPC_linksym1 + MWLinker_PPC_symfullpath1 + MWLinker_PPC_linkmap0 + MWLinker_PPC_nolinkwarnings0 + MWLinker_PPC_dontdeadstripinitcode0 + MWLinker_PPC_permitmultdefs0 + MWLinker_PPC_linkmodeFast + MWLinker_PPC_initname__NSInitialize + MWLinker_PPC_mainname + MWLinker_PPC_termname__NSTerminate + + + MWLinker_MachO_exportsNone + MWLinker_MachO_mainnamestart + MWLinker_MachO_currentversion0 + MWLinker_MachO_compatibleversion0 + MWLinker_MachO_symfullpath0 + MWLinker_MachO_supresswarnings0 + MWLinker_MachO_multisymerror0 + MWLinker_MachO_prebind1 + MWLinker_MachO_deadstrip1 + MWLinker_MachO_objectivecsemantics0 + MWLinker_MachO_whichfileloaded0 + MWLinker_MachO_whyfileloaded0 + MWLinker_MachO_readonlyrelocsErrors + MWLinker_MachO_undefinedsymbolsErrors + MWLinker_MachO_twolevelnamespace1 + MWLinker_MachO_stripdebugsymbols0 + + + MWProject_MachO_typeExecutable + MWProject_MachO_outfilea.exe + MWProject_MachO_filecreator???? + MWProject_MachO_filetypeMEXE + MWProject_MachO_stacksize64 + MWProject_MachO_stackaddress0 + MWProject_MachO_flatrsrc1 + MWProject_MachO_flatrsrcfilenamea.rsrc + MWProject_MachO_flatrsrcoutputdir + Path: + PathFormatMacOS + PathRootProject + + MWProject_MachO_installpath./ + + + MWPEF_exportsPragma + MWPEF_libfolder0 + MWPEF_sortcodeNone + MWPEF_expandbss0 + MWPEF_sharedata0 + MWPEF_olddefversion0 + MWPEF_oldimpversion0 + MWPEF_currentversion0 + MWPEF_fragmentnamemngDecoderLib + MWPEF_collapsereloads0 + + + MWProject_PPC_typeSharedLibrary + MWProject_PPC_outfilemngdecoderDebug.shlb + MWProject_PPC_filecreatorMOZZ + MWProject_PPC_filetypeshlb + MWProject_PPC_size0 + MWProject_PPC_minsize0 + MWProject_PPC_stacksize0 + MWProject_PPC_flags0 + MWProject_PPC_symfilename + MWProject_PPC_rsrcname + MWProject_PPC_rsrcheaderNative + MWProject_PPC_rsrctype???? + MWProject_PPC_rsrcid0 + MWProject_PPC_rsrcflags0 + MWProject_PPC_rsrcstore0 + MWProject_PPC_rsrcmerge0 + MWProject_PPC_flatrsrc0 + MWProject_PPC_flatrsrcoutputdir + Path: + PathFormatMacOS + PathRootProject + + MWProject_PPC_flatrsrcfilename + + + MWAssembler_PPC_auxheader0 + MWAssembler_PPC_symmodeMac + MWAssembler_PPC_dialectPPC + MWAssembler_PPC_prefixfile + MWAssembler_PPC_typecheck0 + MWAssembler_PPC_warnings0 + MWAssembler_PPC_casesensitive0 + + + MWRez_Language_maxwidth80 + MWRez_Language_scriptRoman + MWRez_Language_alignmentAlign1 + MWRez_Language_filtermodeFilterSkip + MWRez_Language_suppresswarnings0 + MWRez_Language_escapecontrolchars1 + MWRez_Language_prefixname + MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' + + + MWWinRC_prefixname + + + MWCodeGen_X86_processorGeneric + MWCodeGen_X86_alignmentbytes8 + MWCodeGen_X86_exceptionsZeroOverhead + MWCodeGen_X86_extinst_mmx0 + MWCodeGen_X86_extinst_3dnow0 + MWCodeGen_X86_use_mmx_3dnow_convention0 + MWCodeGen_X86_machinecodelisting0 + MWCodeGen_X86_intrinsics0 + MWCodeGen_X86_syminfo0 + MWCodeGen_X86_codeviewinfo1 + MWCodeGen_X86_extinst_cmov_fcomi0 + MWCodeGen_X86_extinst_sse0 + + + PDisasmX86_showHeaderstrue + PDisasmX86_showSymTabtrue + PDisasmX86_showCodetrue + PDisasmX86_showSourcefalse + PDisasmX86_showHextrue + PDisasmX86_showRelocationtrue + PDisasmX86_showCommentsfalse + PDisasmX86_showDebugfalse + PDisasmX86_showExceptionsfalse + PDisasmX86_showDatatrue + PDisasmX86_showRawfalse + PDisasmX86_verbosefalse + + + MWDebugger_X86_Exceptions + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + GlobalOptimizer_X86_optimizationlevelLevel0 + GlobalOptimizer_X86_optforSpeed + + + MWLinker_X86_entrypointusageDefault + MWLinker_X86_entrypoint + MWLinker_X86_subsystemWinGUI + MWLinker_X86_subsysmajorid4 + MWLinker_X86_subsysminorid0 + MWLinker_X86_usrmajorid0 + MWLinker_X86_usrminorid0 + MWLinker_X86_commandfile + MWLinker_X86_generatemap0 + MWLinker_X86_linksym0 + MWLinker_X86_linkCV1 + + + MWProject_X86_typeApplication + MWProject_X86_outfilenoname.exe + MWProject_X86_baseaddress4194304 + MWProject_X86_maxstacksize1024 + MWProject_X86_minstacksize4 + MWProject_X86_size1024 + MWProject_X86_minsize4 + MWProject_X86_importlib + xpidl Settings + 0001000101000000000000000000000000000000000000000000000000000000 + 0000000000000000 + + + + + Name + NSPR20Debug.shlb + MacOS + Library + Debug + + + Name + NSRuntimeDebug.shlb + MacOS + Library + Debug + + + Name + NSStdLibDebug.shlb + MacOS + Library + Debug + + + Name + xpcomDebug.shlb + MacOS + Library + Debug + + + Name + zlibDebug.shlb + MacOS + Library + Debug + + + Name + InterfacesStubs + MacOS + Library + Debug + + + Name + NSComponentStartup.o + MacOS + Library + Debug + + + Name + nsMNGDecoder.cpp + MacOS + Text + + + + Name + imgContainerMNG.cpp + MacOS + Text + + + + Name + nsMNGFactory.cpp + MacOS + Text + + + + Name + mngDebug.o + MacOS + Library + + + + Name + JPEGDebug.o + MacOS + Library + + + + + + Name + NSComponentStartup.o + MacOS + + + Name + NSPR20Debug.shlb + MacOS + + + Name + NSRuntimeDebug.shlb + MacOS + + + Name + NSStdLibDebug.shlb + MacOS + + + Name + xpcomDebug.shlb + MacOS + + + Name + zlibDebug.shlb + MacOS + + + Name + InterfacesStubs + MacOS + + + Name + nsMNGDecoder.cpp + MacOS + + + Name + imgContainerMNG.cpp + MacOS + + + Name + nsMNGFactory.cpp + MacOS + + + Name + mngDebug.o + MacOS + + + Name + JPEGDebug.o + MacOS + + + + + mngdecoder.shlb + + + + UserSourceTrees + + + AlwaysSearchUserPathsfalse + InterpretDOSAndUnixPathsfalse + RequireFrameworkStyleIncludesfalse + UserSearchPaths + + SearchPath + Path:: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::::dist: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SystemSearchPaths + + SearchPath + Path:MSL: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path:MacOS Support: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + FrameworkPathfalse + HostFlagsMacOS + + + + + MWRuntimeSettings_WorkingDirectory + MWRuntimeSettings_CommandLine + MWRuntimeSettings_HostApplication + Path + PathFormatGeneric + PathRootAbsolute + + MWRuntimeSettings_EnvVars + + + LinkerMacOS PPC Linker + PreLinker + PostLinker + Targetnamemngdecoder.shlb + OutputDirectory + Path: + PathFormatMacOS + PathRootProject + + SaveEntriesUsingRelativePathsfalse + + + FileMappings + + FileTypeAPPL + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeAppl + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeMMLB + FileExtension + CompilerLib Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMPLF + FileExtension + CompilerLib Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMWCD + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeRSRC + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.bh + CompilerBalloon Help + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c++ + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cc + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cp + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.cpp + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.exp + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.h + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileTypeTEXT + FileExtension.p + CompilerMW Pascal PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pas + CompilerMW Pascal PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.pch++ + CompilerMW C/C++ PPC + EditLanguageC/C++ + Precompiletrue + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.r + CompilerRez + EditLanguageRez + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.s + CompilerPPCAsm + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeXCOF + FileExtension + CompilerXCOFF Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypedocu + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypersrc + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFiletrue + IgnoredByMakefalse + + + FileTypeshlb + FileExtension + CompilerPEF Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypestub + FileExtension + CompilerPEF Import PPC + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.doc + Compiler + EditLanguage + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMaketrue + + + + + CacheModDatesfalse + ActivateBrowsertrue + DumpBrowserInfofalse + CacheSubprojectstrue + UseThirdPartyDebuggerfalse + DebuggerAppPath + Path + PathFormatGeneric + PathRootAbsolute + + DebuggerCmdLineArgs + DebuggerWorkingDir + Path + PathFormatGeneric + PathRootAbsolute + + + + LogSystemMessagestrue + AutoTargetDLLsfalse + StopAtWatchpointstrue + PauseWhileRunningfalse + PauseInterval5 + PauseUIFlags0 + AltExePath + Path + PathFormatGeneric + PathRootAbsolute + + StopAtTempBPOnLaunchtrue + CacheSymbolicstrue + TempBPFunctionNamemain + TempBPType0 + + + Enabledfalse + ConnectionName + DownloadPath + LaunchRemoteAppfalse + RemoteAppPath + + + OtherExecutables + + + CustomColor1 + Red0 + Green39321 + Blue0 + + CustomColor2 + Red0 + Green32767 + Blue0 + + CustomColor3 + Red0 + Green32767 + Blue0 + + CustomColor4 + Red0 + Green32767 + Blue0 + + + + MWFrontEnd_C_cplusplus0 + MWFrontEnd_C_checkprotos0 + MWFrontEnd_C_arm0 + MWFrontEnd_C_trigraphs0 + MWFrontEnd_C_onlystdkeywords0 + MWFrontEnd_C_enumsalwaysint1 + MWFrontEnd_C_mpwpointerstyle0 + MWFrontEnd_C_prefixnameMacPrefix.h + MWFrontEnd_C_ansistrict0 + MWFrontEnd_C_mpwcnewline0 + MWFrontEnd_C_wchar_type1 + MWFrontEnd_C_enableexceptions1 + MWFrontEnd_C_dontreusestrings0 + MWFrontEnd_C_poolstrings0 + MWFrontEnd_C_dontinline0 + MWFrontEnd_C_useRTTI0 + MWFrontEnd_C_multibyteaware0 + MWFrontEnd_C_unsignedchars0 + MWFrontEnd_C_autoinline0 + MWFrontEnd_C_booltruefalse0 + MWFrontEnd_C_direct_to_som0 + MWFrontEnd_C_som_env_check0 + MWFrontEnd_C_alwaysinline0 + MWFrontEnd_C_inlinelevel0 + MWFrontEnd_C_ecplusplus0 + MWFrontEnd_C_objective_c0 + MWFrontEnd_C_defer_codegen0 + + + MWWarning_C_warn_illpragma1 + MWWarning_C_warn_emptydecl1 + MWWarning_C_warn_possunwant1 + MWWarning_C_warn_unusedvar1 + MWWarning_C_warn_unusedarg0 + MWWarning_C_warn_extracomma1 + MWWarning_C_pedantic1 + MWWarning_C_warningerrors0 + MWWarning_C_warn_hidevirtual1 + MWWarning_C_warn_implicitconv0 + MWWarning_C_warn_notinlined0 + MWWarning_C_warn_structclass0 + + + MWFTP_Post_hostName + MWFTP_Post_username + MWFTP_Post_password0 + MWFTP_Post_remoteDir + MWFTP_Post_ftp_PathVersion0 + MWFTP_Post_ftp_PathType0 + MWFTP_Post_ftp_PathFormat0 + MWFTP_Post_ftp_tree + MWFTP_Post_uploadDir + MWFTP_Post_ftp_port21 + MWFTP_Post_SendBin1 + MWFTP_Post_ShouldLog1 + + + MWCommandLine_Java_clsName + MWCommandLine_Java_args + + + MWVJavaDebugging_Protocol1 + MWVJavaDebugging_JDKVersion1 + MWVJavaDebugging_TimeOut10 + MWVJavaDebugging_SupportSlowDevicesfalse + + + MWJava_Language_optimizefalse + MWJava_Language_warnDeprecatedfalse + MWJava_Language_emitMapfalse + MWJava_Language_strictFileNamesfalse + MWJava_Language_strictFileHierarchyfalse + MWJava_Language_1_1_Compatiblefalse + MWJava_Language_emitHeaders0 + MWJava_Language_headerTypeJNINativeHeaders + MWJava_Language_packageFilter + MWJava_Language_genCommentstrue + MWJava_Language_genHeadersfalse + + + MWJava_MRJAppBuilder_outFileMRJApplication + MWJava_MRJAppBuilder_mergefalse + MWJava_MRJAppBuilder_quitMenutrue + MWJava_MRJAppBuilder_growfalse + MWJava_MRJAppBuilder_stdoutTypeConsole + MWJava_MRJAppBuilder_stderrTypeConsole + MWJava_MRJAppBuilder_stdinTypeConsole + MWJava_MRJAppBuilder_appIconPVersion0 + MWJava_MRJAppBuilder_appIconPType0 + MWJava_MRJAppBuilder_appIconPFormat0 + MWJava_MRJAppBuilder_appIconPTree + MWJava_MRJAppBuilder_appIconFile + MWJava_MRJAppBuilder_splashScreenPVersion0 + MWJava_MRJAppBuilder_splashScreenPType0 + MWJava_MRJAppBuilder_splashScreenPFormat0 + MWJava_MRJAppBuilder_splashScreenPTree + MWJava_MRJAppBuilder_splashScreenPICTFile + MWJava_MRJAppBuilder_aboutName + MWJava_MRJAppBuilder_stdoutPVersion0 + MWJava_MRJAppBuilder_stdoutPType0 + MWJava_MRJAppBuilder_stdoutPFormat0 + MWJava_MRJAppBuilder_stdoutPTree + MWJava_MRJAppBuilder_stdoutFile + MWJava_MRJAppBuilder_stdoutAppendfalse + MWJava_MRJAppBuilder_stderrPType0 + MWJava_MRJAppBuilder_stderrPFormat0 + MWJava_MRJAppBuilder_stderrPTree + MWJava_MRJAppBuilder_stderrFile + MWJava_MRJAppBuilder_stderrAppendfalse + MWJava_MRJAppBuilder_stdinPType0 + MWJava_MRJAppBuilder_stdinPFormat0 + MWJava_MRJAppBuilder_stdinPTree + MWJava_MRJAppBuilder_stdinFile + + + MWJava_Output_outputtypeJarFile + MWJava_Output_outfileJavaClasses.jar + MWJava_Output_ftype1514754080 + MWJava_Output_fcreator1297570384 + MWJava_Output_compress0 + MWJava_Output_genManifest0 + MWJava_Output_trunctypeFront + MWJava_Output_deleteClasses0 + MWJava_Output_consoleApp1 + + + MWJava_Proj_projtypeApplet + MWJava_Proj_mainClassName + MWJava_Proj_HTMLAppCreator1463898714 + MWJava_Proj_HTMLAppName + MWJava_Proj_PathVersion0 + MWJava_Proj_PathType0 + MWJava_Proj_PathFormat0 + MWJava_Proj_tree + MWJava_Proj_HTMLAppWin32Name + MWJava_Proj_compress0 + MWJava_Proj_useVM1 + MWJava_Proj_vmarguments + MWJava_Proj_vmName + MWJava_Proj_simPropFile + + + MWJavaDoc_Proj_Version1 + MWJavaDoc_Proj_Depricated1 + MWJavaDoc_Proj_Author1 + MWJavaDoc_Proj_Index1 + MWJavaDoc_Proj_Tree1 + MWJavaDoc_Proj_SunResolveToSame0 + MWJavaDoc_Proj_Shortnames1 + MWJavaDoc_Proj_Folder0 + MWJavaDoc_Proj_GenerateAPILinks0 + MWJavaDoc_Proj_scopePublic + MWJavaDoc_Proj_fcreator1297303877 + MWJavaDoc_Proj_encodingName + MWJavaDoc_Proj_decodingName + MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ + + + MWMerge_MacOS_projectTypeApplication + MWMerge_MacOS_outputNameMerge Out + MWMerge_MacOS_outputCreator???? + MWMerge_MacOS_outputTypeAPPL + MWMerge_MacOS_suppressWarning0 + MWMerge_MacOS_copyFragments1 + MWMerge_MacOS_copyResources1 + MWMerge_MacOS_flattenResource0 + MWMerge_MacOS_flatFileNamea.rsrc + MWMerge_MacOS_flatFileOutputPath + Path: + PathFormatMacOS + PathRootProject + + MWMerge_MacOS_skipResources + DLGX + ckid + Proj + WSPC + + + + FileLockedfalse + ResourcesMapIsReadOnlyfalse + PrinterDriverIsMultiFinderCompatiblefalse + Invisiblefalse + HasBundlefalse + NameLockedfalse + Stationeryfalse + HasCustomIconfalse + Sharedfalse + HasBeenInitedfalse + Label0 + Comments + + + MWMacOSPackager_UsePackager0 + MWMacOSPackager_FolderToPackage + Path: + PathFormatMacOS + PathRootProject + + MWMacOSPackager_CreateClassicAlias0 + MWMacOSPackager_ClassicAliasMethodUseTargetOutput + MWMacOSPackager_ClassicAliasPath + Path: + PathFormatMacOS + PathRootProject + + MWMacOSPackager_CreatePkgInfo0 + MWMacOSPackager_PkgCreatorType???? + MWMacOSPackager_PkgFileTypeAPPL + + + MWCodeGen_PPC_structalignmentPPC + MWCodeGen_PPC_tracebacktablesInline + MWCodeGen_PPC_processorGeneric + MWCodeGen_PPC_readonlystrings1 + MWCodeGen_PPC_tocdata1 + MWCodeGen_PPC_profiler0 + MWCodeGen_PPC_fpcontract1 + MWCodeGen_PPC_schedule0 + MWCodeGen_PPC_peephole1 + MWCodeGen_PPC_processorspecific0 + MWCodeGen_PPC_altivec0 + MWCodeGen_PPC_vectortocdata0 + MWCodeGen_PPC_vrsave0 + + + MWCodeGen_MachO_structalignmentPPC + MWCodeGen_MachO_tracebacktablesNone + MWCodeGen_MachO_processorGeneric + MWCodeGen_MachO_readonlystrings0 + MWCodeGen_MachO_profiler0 + MWCodeGen_MachO_fpcontract1 + MWCodeGen_MachO_schedule0 + MWCodeGen_MachO_peephole1 + MWCodeGen_MachO_processorspecific0 + MWCodeGen_MachO_altivec0 + MWCodeGen_MachO_vrsave1 + MWCodeGen_MachO_common0 + MWCodeGen_MachO_implicit_templates1 + + + MWDisassembler_PPC_showcode1 + MWDisassembler_PPC_extended1 + MWDisassembler_PPC_mix0 + MWDisassembler_PPC_nohex0 + MWDisassembler_PPC_showdata1 + MWDisassembler_PPC_showexceptions1 + MWDisassembler_PPC_showsym0 + MWDisassembler_PPC_shownames1 + + + GlobalOptimizer_PPC_optimizationlevelLevel4 + GlobalOptimizer_PPC_optforSpeed + + + MWLinker_PPC_linksym1 + MWLinker_PPC_symfullpath1 + MWLinker_PPC_linkmap0 + MWLinker_PPC_nolinkwarnings0 + MWLinker_PPC_dontdeadstripinitcode0 + MWLinker_PPC_permitmultdefs0 + MWLinker_PPC_linkmodeFast + MWLinker_PPC_initname__NSInitialize + MWLinker_PPC_mainname + MWLinker_PPC_termname__NSTerminate + + + MWLinker_MachO_exportsNone + MWLinker_MachO_mainnamestart + MWLinker_MachO_currentversion0 + MWLinker_MachO_compatibleversion0 + MWLinker_MachO_symfullpath0 + MWLinker_MachO_supresswarnings0 + MWLinker_MachO_multisymerror0 + MWLinker_MachO_prebind1 + MWLinker_MachO_deadstrip1 + MWLinker_MachO_objectivecsemantics0 + MWLinker_MachO_whichfileloaded0 + MWLinker_MachO_whyfileloaded0 + MWLinker_MachO_readonlyrelocsErrors + MWLinker_MachO_undefinedsymbolsErrors + MWLinker_MachO_twolevelnamespace1 + MWLinker_MachO_stripdebugsymbols0 + + + MWProject_MachO_typeExecutable + MWProject_MachO_outfilea.exe + MWProject_MachO_filecreator???? + MWProject_MachO_filetypeMEXE + MWProject_MachO_stacksize64 + MWProject_MachO_stackaddress0 + MWProject_MachO_flatrsrc1 + MWProject_MachO_flatrsrcfilenamea.rsrc + MWProject_MachO_flatrsrcoutputdir + Path: + PathFormatMacOS + PathRootProject + + MWProject_MachO_installpath./ + + + MWPEF_exportsPragma + MWPEF_libfolder0 + MWPEF_sortcodeNone + MWPEF_expandbss0 + MWPEF_sharedata0 + MWPEF_olddefversion0 + MWPEF_oldimpversion0 + MWPEF_currentversion0 + MWPEF_fragmentnamemngDecoderLib + MWPEF_collapsereloads0 + + + MWProject_PPC_typeSharedLibrary + MWProject_PPC_outfilemngdecoder.shlb + MWProject_PPC_filecreatorMOZZ + MWProject_PPC_filetypeshlb + MWProject_PPC_size0 + MWProject_PPC_minsize0 + MWProject_PPC_stacksize0 + MWProject_PPC_flags0 + MWProject_PPC_symfilename + MWProject_PPC_rsrcname + MWProject_PPC_rsrcheaderNative + MWProject_PPC_rsrctype???? + MWProject_PPC_rsrcid0 + MWProject_PPC_rsrcflags0 + MWProject_PPC_rsrcstore0 + MWProject_PPC_rsrcmerge0 + MWProject_PPC_flatrsrc0 + MWProject_PPC_flatrsrcoutputdir + Path: + PathFormatMacOS + PathRootProject + + MWProject_PPC_flatrsrcfilename + + + MWAssembler_PPC_auxheader0 + MWAssembler_PPC_symmodeMac + MWAssembler_PPC_dialectPPC + MWAssembler_PPC_prefixfile + MWAssembler_PPC_typecheck0 + MWAssembler_PPC_warnings0 + MWAssembler_PPC_casesensitive0 + + + MWRez_Language_maxwidth80 + MWRez_Language_scriptRoman + MWRez_Language_alignmentAlign1 + MWRez_Language_filtermodeFilterSkip + MWRez_Language_suppresswarnings0 + MWRez_Language_escapecontrolchars1 + MWRez_Language_prefixname + MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' + + + MWWinRC_prefixname + + + MWCodeGen_X86_processorGeneric + MWCodeGen_X86_alignmentbytes8 + MWCodeGen_X86_exceptionsZeroOverhead + MWCodeGen_X86_extinst_mmx0 + MWCodeGen_X86_extinst_3dnow0 + MWCodeGen_X86_use_mmx_3dnow_convention0 + MWCodeGen_X86_machinecodelisting0 + MWCodeGen_X86_intrinsics0 + MWCodeGen_X86_syminfo0 + MWCodeGen_X86_codeviewinfo1 + MWCodeGen_X86_extinst_cmov_fcomi0 + MWCodeGen_X86_extinst_sse0 + + + PDisasmX86_showHeaderstrue + PDisasmX86_showSymTabtrue + PDisasmX86_showCodetrue + PDisasmX86_showSourcefalse + PDisasmX86_showHextrue + PDisasmX86_showRelocationtrue + PDisasmX86_showCommentsfalse + PDisasmX86_showDebugfalse + PDisasmX86_showExceptionsfalse + PDisasmX86_showDatatrue + PDisasmX86_showRawfalse + PDisasmX86_verbosefalse + + + MWDebugger_X86_Exceptions + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + GlobalOptimizer_X86_optimizationlevelLevel0 + GlobalOptimizer_X86_optforSpeed + + + MWLinker_X86_entrypointusageDefault + MWLinker_X86_entrypoint + MWLinker_X86_subsystemWinGUI + MWLinker_X86_subsysmajorid4 + MWLinker_X86_subsysminorid0 + MWLinker_X86_usrmajorid0 + MWLinker_X86_usrminorid0 + MWLinker_X86_commandfile + MWLinker_X86_generatemap0 + MWLinker_X86_linksym0 + MWLinker_X86_linkCV1 + + + MWProject_X86_typeApplication + MWProject_X86_outfilenoname.exe + MWProject_X86_baseaddress4194304 + MWProject_X86_maxstacksize1024 + MWProject_X86_minstacksize4 + MWProject_X86_size1024 + MWProject_X86_minsize4 + MWProject_X86_importlib + xpidl Settings + 0001000101000000000000000000000000000000000000000000000000000000 + 0000000000000000 + + + + + Name + InterfacesStubs + MacOS + Library + Debug + + + Name + NSPR20.shlb + MacOS + Library + Debug + + + Name + NSRuntime.shlb + MacOS + Library + Debug + + + Name + NSStdLib.shlb + MacOS + Library + Debug + + + Name + xpcom.shlb + MacOS + Library + Debug + + + Name + zlib.shlb + MacOS + Library + Debug + + + Name + NSComponentStartup.o + MacOS + Library + Debug + + + Name + nsMNGDecoder.cpp + MacOS + Text + + + + Name + imgContainerMNG.cpp + MacOS + Text + + + + Name + nsMNGFactory.cpp + MacOS + Text + + + + Name + mng.o + MacOS + Library + + + + Name + JPEG.o + MacOS + Library + + + + + + Name + NSComponentStartup.o + MacOS + + + Name + InterfacesStubs + MacOS + + + Name + NSPR20.shlb + MacOS + + + Name + NSRuntime.shlb + MacOS + + + Name + NSStdLib.shlb + MacOS + + + Name + xpcom.shlb + MacOS + + + Name + zlib.shlb + MacOS + + + Name + nsMNGDecoder.cpp + MacOS + + + Name + imgContainerMNG.cpp + MacOS + + + Name + nsMNGFactory.cpp + MacOS + + + Name + mng.o + MacOS + + + Name + JPEG.o + MacOS + + + + + + + mngdecoderDebug.shlb + mngdecoder.shlb + + + + mng + + mngdecoderDebug.shlb + Name + nsMNGDecoder.cpp + MacOS + + + mngdecoderDebug.shlb + Name + imgContainerMNG.cpp + MacOS + + + mngdecoderDebug.shlb + Name + nsMNGFactory.cpp + MacOS + + + NS Libraries + Optimized + + mngdecoder.shlb + Name + NSPR20.shlb + MacOS + + + mngdecoder.shlb + Name + NSRuntime.shlb + MacOS + + + mngdecoder.shlb + Name + NSStdLib.shlb + MacOS + + + mngdecoder.shlb + Name + xpcom.shlb + MacOS + + + mngdecoder.shlb + Name + zlib.shlb + MacOS + + + mngdecoder.shlb + Name + mng.o + MacOS + + + mngdecoder.shlb + Name + JPEG.o + MacOS + + + Debug + + mngdecoderDebug.shlb + Name + NSPR20Debug.shlb + MacOS + + + mngdecoderDebug.shlb + Name + NSRuntimeDebug.shlb + MacOS + + + mngdecoderDebug.shlb + Name + NSStdLibDebug.shlb + MacOS + + + mngdecoderDebug.shlb + Name + xpcomDebug.shlb + MacOS + + + mngdecoderDebug.shlb + Name + zlibDebug.shlb + MacOS + + + mngdecoderDebug.shlb + Name + mngDebug.o + MacOS + + + mngdecoderDebug.shlb + Name + JPEGDebug.o + MacOS + + + + System Libraries + + mngdecoderDebug.shlb + Name + NSComponentStartup.o + MacOS + + + mngdecoderDebug.shlb + Name + InterfacesStubs + MacOS + + + + + diff --git a/mozilla/modules/libpr0n/src/imgRequest.cpp b/mozilla/modules/libpr0n/src/imgRequest.cpp index 1fb1ff2bb86..6ff43b12154 100644 --- a/mozilla/modules/libpr0n/src/imgRequest.cpp +++ b/mozilla/modules/libpr0n/src/imgRequest.cpp @@ -814,5 +814,23 @@ imgRequest::SniffMimeType(const char *buf, PRUint32 len) return; } + if (len >= 4 && ((unsigned char)buf[0]==0x8A && + (unsigned char)buf[1]==0x4D && + (unsigned char)buf[2]==0x4E && + (unsigned char)buf[3]==0x47)) + { + mContentType = nsCRT::strndup("video/x-mng", 11); + return; + } + + if (len >= 4 && ((unsigned char)buf[0]==0x8B && + (unsigned char)buf[1]==0x4A && + (unsigned char)buf[2]==0x4E && + (unsigned char)buf[3]==0x47)) + { + mContentType = nsCRT::strndup("image/x-jng", 11); + return; + } + /* none of the above? I give up */ } diff --git a/mozilla/netwerk/mime/public/nsMimeTypes.h b/mozilla/netwerk/mime/public/nsMimeTypes.h index ce75dd4b522..a5c7cb99fbc 100644 --- a/mozilla/netwerk/mime/public/nsMimeTypes.h +++ b/mozilla/netwerk/mime/public/nsMimeTypes.h @@ -104,6 +104,8 @@ #define IMAGE_TIFF "image/tiff" #define IMAGE_BMP "image/bmp" #define IMAGE_ICO "image/x-icon" +#define IMAGE_MNG "video/x-mng" +#define IMAGE_JNG "image/x-jng" #define MESSAGE_EXTERNAL_BODY "message/external-body" #define MESSAGE_NEWS "message/news" diff --git a/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp b/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp index d398a43e4bf..b7a5d8ad114 100644 --- a/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp +++ b/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp @@ -510,6 +510,12 @@ nsXMLMIMEDataSource::InitFromHack() { rv = AddMapping(IMAGE_PNG, "png", "PNG Image", nsnull); if (NS_FAILED(rv)) return rv; + rv = AddMapping(IMAGE_MNG, "mng", "MNG Image", nsnull); + if (NS_FAILED(rv)) return rv; + + rv = AddMapping(IMAGE_JNG, "jng", "JNG Image", nsnull); + if (NS_FAILED(rv)) return rv; + rv = AddMapping(IMAGE_ART, "art", "ART Image", nsnull); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp index 2bd6a282721..f27d5d7253f 100644 --- a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp +++ b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp @@ -442,6 +442,24 @@ void nsUnknownDecoder::SniffForImageMimeType(const char *buf, PRUint32 len) return; } + if (len >= 4 && ((unsigned char)buf[0]==0x8A && + (unsigned char)buf[1]==0x4D && + (unsigned char)buf[2]==0x4E && + (unsigned char)buf[3]==0x47)) + { + mContentType = NS_LITERAL_CSTRING("video/x-mng"); + return; + } + + if (len >= 4 && ((unsigned char)buf[0]==0x8B && + (unsigned char)buf[1]==0x4A && + (unsigned char)buf[2]==0x4E && + (unsigned char)buf[3]==0x47)) + { + mContentType = NS_LITERAL_CSTRING("image/x-jng"); + return; + } + /* none of the above? I give up */ } diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp index 13a62c3bd84..9fb7bfa9703 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -107,6 +107,8 @@ static nsDefaultMimeTypeEntry defaultMimeEntries [] = { IMAGE_PNG, "png", "PNG Image", 0, 0 }, { IMAGE_BMP, "bmp", "BMP Image", 0, 0 }, { IMAGE_ICO, "ico", "ICO Image", 0, 0 }, + { IMAGE_MNG, "mng", "MNG Image", 0, 0 }, + { IMAGE_JNG, "jng", "JNG Image", 0, 0 }, { APPLICATION_XPINSTALL, "xpi", "XPInstall Install", 'xpi*','MOSS' }, }; diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index 16f5d974606..913017592fa 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -1089,6 +1089,16 @@ static nsModuleComponentInfo components[] = { NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-icon", nsBrowserContentHandlerConstructor }, + { "Browser Content Handler", + NS_BROWSERCONTENTHANDLER_CID, + NS_CONTENT_HANDLER_CONTRACTID_PREFIX"video/x-mng", + nsBrowserContentHandlerConstructor + }, + { "Browser Content Handler", + NS_BROWSERCONTENTHANDLER_CID, + NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-jng", + nsBrowserContentHandlerConstructor + }, { "Browser Content Handler", NS_BROWSERCONTENTHANDLER_CID, NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/http-index-format", diff --git a/mozilla/xpinstall/packager/packages-mac b/mozilla/xpinstall/packager/packages-mac index dfe8572ad69..74201669a0d 100644 --- a/mozilla/xpinstall/packager/packages-mac +++ b/mozilla/xpinstall/packager/packages-mac @@ -205,6 +205,7 @@ viewer:Components:jpegdecoder2.shlb viewer:Components:icondecoder.shlb viewer:Components:icondecoder.xpt viewer:Components:bmpdecoder.shlb +viewer:Components:mngdecoder.shlb viewer:Components:Necko.shlb viewer:Components:Necko2.shlb diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index 266a9629ce9..c9a372d2e8c 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -116,6 +116,7 @@ bin/components/libimgjpeg.so bin/components/libimgpng.so bin/components/libimgppm.so bin/components/libimgbmp.so +bin/components/libimgmng.so bin/components/libjsurl.so bin/components/liblwbrk.so bin/components/libmork.so diff --git a/mozilla/xpinstall/packager/packages-win b/mozilla/xpinstall/packager/packages-win index 80b13372da0..d50add23817 100644 --- a/mozilla/xpinstall/packager/packages-win +++ b/mozilla/xpinstall/packager/packages-win @@ -129,6 +129,7 @@ bin\components\gkview.dll bin\components\imggif.dll bin\components\imgjpeg.dll bin\components\imgbmp.dll +bin\components\imgmng.dll bin\components\imglib2.dll bin\components\imglib2.xpt bin\components\imgpng.dll