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

preview print driver: fixes 64 bit warnings

Browse Source
This commit is contained in:
Jérôme Duval
2013-05-10 21:24:47 +02:00
parent e393a1691b
commit 14bf5c3248
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/print/drivers/preview/JobSetupWindow.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ void
JobSetupWindow::UpdateJobMessage() JobSetupWindow::UpdateJobMessage()
{ {
int32 from = 1; int32 from = 1;
int32 to = LONG_MAX; int32 to = INT32_MAX;
if (fAll->Value() == B_CONTROL_OFF) { if (fAll->Value() == B_CONTROL_OFF) {
from = atoi(fFrom->Text()); from = atoi(fFrom->Text());
to = atoi(fTo->Text()); to = atoi(fTo->Text());
src/add-ons/print/drivers/preview/PrinterDriver.cpp
+9 -7
View File
@@ -78,8 +78,8 @@ PrinterDriver::PrintJob(BFile *spoolFile, BMessage *jobMsg)
printf("\n"); printf("\n");
for (int32 page = 1; page <= pfh.page_count; ++page) { for (int32 page = 1; page <= pfh.page_count; ++page) {
printf("PrinterDriver::PrintPage(): Faking print of page %ld/ %ld\n", printf("PrinterDriver::PrintPage(): Faking print of page %" B_PRId32
page, pfh.page_count); "/ %" B_PRId32 "\n", page, pfh.page_count);
} }
fJobFile->Seek(0, SEEK_SET); fJobFile->Seek(0, SEEK_SET);
@@ -87,9 +87,10 @@ PrinterDriver::PrintJob(BFile *spoolFile, BMessage *jobMsg)
status_t status = reader.InitCheck(); status_t status = reader.InitCheck();
printf("\nPrintJobReader::InitCheck(): %s\n", status == B_OK ? "B_OK" : "B_ERROR"); printf("\nPrintJobReader::InitCheck(): %s\n", status == B_OK ? "B_OK" : "B_ERROR");
printf("PrintJobReader::NumberOfPages(): %ld\n", reader.NumberOfPages()); printf("PrintJobReader::NumberOfPages(): %" B_PRId32 "\n",
printf("PrintJobReader::FirstPage(): %ld\n", reader.FirstPage()); reader.NumberOfPages());
printf("PrintJobReader::LastPage(): %ld\n", reader.LastPage()); printf("PrintJobReader::FirstPage(): %" B_PRId32 "\n", reader.FirstPage());
printf("PrintJobReader::LastPage(): %" B_PRId32 "\n", reader.LastPage());
BRect rect = reader.PaperRect(); BRect rect = reader.PaperRect();
printf("PrintJobReader::PaperRect(): BRect(l:%.1f, t:%.1f, r:%.1f, b:%.1f)\n", printf("PrintJobReader::PaperRect(): BRect(l:%.1f, t:%.1f, r:%.1f, b:%.1f)\n",
@@ -101,7 +102,8 @@ PrinterDriver::PrintJob(BFile *spoolFile, BMessage *jobMsg)
int32 xdpi, ydpi; int32 xdpi, ydpi;
reader.GetResolution(&xdpi, &ydpi); reader.GetResolution(&xdpi, &ydpi);
printf("PrintJobReader::GetResolution(): xdpi:%ld, ydpi:%ld\n", xdpi, ydpi); printf("PrintJobReader::GetResolution(): xdpi:%" B_PRId32 ", ydpi:%"
B_PRId32 "\n", xdpi, ydpi);
printf("PrintJobReader::GetScale(): %.1f\n", reader.GetScale()); printf("PrintJobReader::GetScale(): %.1f\n", reader.GetScale());
fPrinting = false; fPrinting = false;
@@ -172,7 +174,7 @@ PrinterDriver::JobSetup(BMessage *jobMsg, const char *printerName)
jobMsg->AddInt32("first_page", 1); jobMsg->AddInt32("first_page", 1);
if (!jobMsg->HasInt32("last_page")) if (!jobMsg->HasInt32("last_page"))
jobMsg->AddInt32("last_page", LONG_MAX); jobMsg->AddInt32("last_page", INT32_MAX);
BlockingWindow* w = NewJobSetupWindow(jobMsg, printerName); BlockingWindow* w = NewJobSetupWindow(jobMsg, printerName);
return w->Go(); return w->Go();