i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added translator add-ons.

Browse Source
This commit is contained in:
Alex Smith
2012-08-10 11:35:24 +01:00
parent 81aad168f8
commit 2b861dd2a5
8 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/Haiku64Image
+29 -4
View File
@@ -44,20 +44,27 @@ SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
SYSTEM_DEMOS = ;
SYSTEM_LIBS = libbe.so libbnetapi.so libdebug.so libnetwork.so
libroot.so libroot-addon-icu.so
libtextencoding.so libtracker.so libtranslation.so
SYSTEM_LIBS = libbe.so libbnetapi.so libdebug.so libjpeg.so libnetwork.so
libpng.so libroot.so libroot-addon-icu.so
libtextencoding.so libtiff.so libtracker.so libtranslation.so
libz.so
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
$(HAIKU_FREETYPE_CURRENT_LIB)
;
PRIVATE_SYSTEM_LIBS = ;
PRIVATE_SYSTEM_LIBS = libilmimf.so ;
SYSTEM_SERVERS = app_server debug_server input_server mount_server
notification_server registrar syslog_daemon
;
SYSTEM_ADD_ONS_ACCELERANTS = vesa.accelerant ;
SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
PCXTranslator PNGTranslator PPMTranslator
RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
TIFFTranslator WebPTranslator WonderBrushTranslator
;
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = vesa ;
@@ -191,6 +198,12 @@ AddFilesToHaikuImage home config boot : $(userBootScripts) ;
# Add boot launch directory
AddDirectoryToHaikuImage home config boot launch ;
local logoArtwork =
$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"
$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - normal.png" ;
SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
AddFilesToHaikuImage system data artwork : $(logoArtwork) ;
local etcDir = [ FDirName $(HAIKU_TOP) data etc ] ;
local etcFiles = inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
@@ -293,6 +306,8 @@ AddBootModuleSymlinksToHaikuImage
AddFilesToHaikuImage system add-ons accelerants
: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
AddFilesToHaikuHybridImage system add-ons Translators
: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
AddFilesToHaikuImage system add-ons input_server devices
: <input>keyboard <input>mouse <input>tablet <input>wacom ;
@@ -310,6 +325,16 @@ AddDirectoryToHaikuImage common cache tmp ;
AddDirectoryToHaikuImage home config add-ons kernel drivers bin ;
AddDirectoryToHaikuImage home config add-ons kernel drivers dev ;
AddDirectoryToHaikuImage home config add-ons input_server devices ;
AddDirectoryToHaikuImage home config add-ons input_server filters ;
AddDirectoryToHaikuImage home config add-ons input_server methods ;
AddDirectoryToHaikuImage home config add-ons media plugins ;
AddDirectoryToHaikuImage home config add-ons Tracker ;
AddDirectoryToHaikuImage home config add-ons Print ;
AddDirectoryToHaikuImage home config add-ons Screen\ Savers ;
AddDirectoryToHaikuImage home config add-ons Translators ;
AddDirectoryToHaikuImage system data synth ;
AddDirectoryToHaikuImage system add-ons input_server methods ;
# licenses
CopyDirectoryToHaikuImage system data
src/add-ons/translators/bmp/BMPTranslator.cpp
+4 -3
View File
@@ -648,7 +648,8 @@ BPositionIO *outDestination, color_space fromspace, MSInfoHeader &msheader)
}
}
while (rd == static_cast<ssize_t>(bitsRowBytes)) {
printf("translate_from_bits_to_bmp24() bmppixrow %ld\n", bmppixrow);
printf("translate_from_bits_to_bmp24() bmppixrow %" B_PRId32 "\n",
bmppixrow);
for (int32 i = 0; i < msheader.width; i++) {
uint8 *bitspixel, *bmppixel;
@@ -1734,12 +1735,12 @@ BMPTranslator::translate_from_bmp(BPositionIO *inSource, uint32 outType,
if (!frommsformat && os2skip)
inSource->Seek(os2skip, SEEK_CUR);
rd = min((size_t)1024, fileHeader.fileSize - rdtotal);
rd = min((uint32)1024, fileHeader.fileSize - rdtotal);
rd = inSource->Read(buf, rd);
while (rd > 0) {
outDestination->Write(buf, rd);
rdtotal += rd;
rd = min((size_t)1024, fileHeader.fileSize - rdtotal);
rd = min((uint32)1024, fileHeader.fileSize - rdtotal);
rd = inSource->Read(buf, rd);
}
if (rd == 0)
src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
+1 -1
View File
@@ -545,7 +545,7 @@ SSlider::SSlider(const char* name, const char* label,
const char*
SSlider::UpdateText() const
{
snprintf(fStatusLabel, sizeof(fStatusLabel), "%ld", Value());
snprintf(fStatusLabel, sizeof(fStatusLabel), "%" B_PRId32, Value());
return fStatusLabel;
}
src/add-ons/translators/raw/RAW.cpp
+1 -1
View File
@@ -2658,7 +2658,7 @@ DCRaw::_LoadRAW(const image_data_info& image)
break;
default:
fprintf(stderr, "DCRaw: unknown compression: %ld\n",
fprintf(stderr, "DCRaw: unknown compression: %" B_PRId32 "\n",
image.compression);
throw (status_t)B_NO_TRANSLATOR;
break;
src/add-ons/translators/rtf/RTF.cpp
+4 -4
View File
@@ -104,16 +104,16 @@ string_array_compare(const char *key, const char **array)
static void
dump(Element &element, int32 level = 0)
{
printf("%03ld (%p):", level, &element);
printf("%03" B_PRId32 " (%p):", level, &element);
for (int32 i = 0; i < level; i++)
printf(" ");
if (RTF::Header *header = dynamic_cast<RTF::Header *>(&element)) {
printf("<RTF header, major version %ld>\n", header->Version());
printf("<RTF header, major version %" B_PRId32 ">\n", header->Version());
} else if (RTF::Command *command = dynamic_cast<RTF::Command *>(&element)) {
printf("<Command: %s", command->Name());
if (command->HasOption())
printf(", Option %ld", command->Option());
printf(", Option %" B_PRId32, command->Option());
puts(">");
} else if (RTF::Text *text = dynamic_cast<RTF::Text *>(&element)) {
printf("<Text>");
@@ -285,7 +285,7 @@ Group::Group()
Group::~Group()
{
Element *element;
while ((element = (Element *)fElements.RemoveItem(0L)) != NULL) {
while ((element = (Element *)fElements.RemoveItem((int32)0)) != NULL) {
delete element;
}
}
src/add-ons/translators/rtf/convert.cpp
+3 -3
View File
@@ -214,7 +214,7 @@ process_command(conversion_context &context, RTF::Command *command,
if (!strcmp(name, "sectnum")) {
char buffer[64];
snprintf(buffer, sizeof(buffer), "%ld", context.section);
snprintf(buffer, sizeof(buffer), "%" B_PRId32, context.section);
return write_text(context, buffer, target);
}
if (!strcmp(name, "pgnstarts")) {
@@ -227,7 +227,7 @@ process_command(conversion_context &context, RTF::Command *command,
}
if (!strcmp(name, "chpgn")) {
char buffer[64];
snprintf(buffer, sizeof(buffer), "%ld", context.page);
snprintf(buffer, sizeof(buffer), "%" B_PRId32, context.page);
return write_text(context, buffer, target);
}
return 0;
@@ -354,7 +354,7 @@ TextOutput::FlattenedRunArray(int32 &_size)
array->count = fRuns.CountItems();
for (int32 i = 0; i < array->count; i++) {
text_run *run = (text_run *)fRuns.RemoveItem(0L);
text_run *run = (text_run *)fRuns.RemoveItem((int32)0);
array->runs[i] = *run;
delete run;
}
src/add-ons/translators/stxt/STXTTranslator.cpp
+2 -2
View File
@@ -982,7 +982,7 @@ translate_from_stxt(BPositionIO *inSource, BPositionIO *outDestination,
// of the data from inSource has been read and written.
if (btoplain)
nreed = min((size_t)READ_BUFFER_SIZE,
txtheader.header.data_size - ntotalread);
(size_t)txtheader.header.data_size - ntotalread);
else
nreed = READ_BUFFER_SIZE;
nread = inSource->Read(buffer, nreed);
@@ -994,7 +994,7 @@ translate_from_stxt(BPositionIO *inSource, BPositionIO *outDestination,
if (btoplain) {
ntotalread += nread;
nreed = min((size_t)READ_BUFFER_SIZE,
txtheader.header.data_size - ntotalread);
(size_t)txtheader.header.data_size - ntotalread);
} else
nreed = READ_BUFFER_SIZE;
nread = inSource->Read(buffer, nreed);
src/add-ons/translators/wonderbrush/WonderBrushImage.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include "Canvas.h"
WonderBrushImage::WonderBrushImage()
: fArchive(0UL)
: fArchive((uint32)0)
{
}