From 14bf5c32480a94a675f662fc82faf21da76778fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Fri, 10 May 2013 21:24:47 +0200 Subject: [PATCH] preview print driver: fixes 64 bit warnings --- .../print/drivers/preview/JobSetupWindow.cpp | 2 +- .../print/drivers/preview/PrinterDriver.cpp | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/add-ons/print/drivers/preview/JobSetupWindow.cpp b/src/add-ons/print/drivers/preview/JobSetupWindow.cpp index 9ba38eb419..5d142469cf 100644 --- a/src/add-ons/print/drivers/preview/JobSetupWindow.cpp +++ b/src/add-ons/print/drivers/preview/JobSetupWindow.cpp @@ -121,7 +121,7 @@ void JobSetupWindow::UpdateJobMessage() { int32 from = 1; - int32 to = LONG_MAX; + int32 to = INT32_MAX; if (fAll->Value() == B_CONTROL_OFF) { from = atoi(fFrom->Text()); to = atoi(fTo->Text()); diff --git a/src/add-ons/print/drivers/preview/PrinterDriver.cpp b/src/add-ons/print/drivers/preview/PrinterDriver.cpp index 117e3ecdbc..ef2048f477 100644 --- a/src/add-ons/print/drivers/preview/PrinterDriver.cpp +++ b/src/add-ons/print/drivers/preview/PrinterDriver.cpp @@ -78,8 +78,8 @@ PrinterDriver::PrintJob(BFile *spoolFile, BMessage *jobMsg) printf("\n"); for (int32 page = 1; page <= pfh.page_count; ++page) { - printf("PrinterDriver::PrintPage(): Faking print of page %ld/ %ld\n", - page, pfh.page_count); + printf("PrinterDriver::PrintPage(): Faking print of page %" B_PRId32 + "/ %" B_PRId32 "\n", page, pfh.page_count); } fJobFile->Seek(0, SEEK_SET); @@ -87,9 +87,10 @@ PrinterDriver::PrintJob(BFile *spoolFile, BMessage *jobMsg) status_t status = reader.InitCheck(); printf("\nPrintJobReader::InitCheck(): %s\n", status == B_OK ? "B_OK" : "B_ERROR"); - printf("PrintJobReader::NumberOfPages(): %ld\n", reader.NumberOfPages()); - printf("PrintJobReader::FirstPage(): %ld\n", reader.FirstPage()); - printf("PrintJobReader::LastPage(): %ld\n", reader.LastPage()); + printf("PrintJobReader::NumberOfPages(): %" B_PRId32 "\n", + reader.NumberOfPages()); + printf("PrintJobReader::FirstPage(): %" B_PRId32 "\n", reader.FirstPage()); + printf("PrintJobReader::LastPage(): %" B_PRId32 "\n", reader.LastPage()); BRect rect = reader.PaperRect(); 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; 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()); fPrinting = false; @@ -172,7 +174,7 @@ PrinterDriver::JobSetup(BMessage *jobMsg, const char *printerName) jobMsg->AddInt32("first_page", 1); if (!jobMsg->HasInt32("last_page")) - jobMsg->AddInt32("last_page", LONG_MAX); + jobMsg->AddInt32("last_page", INT32_MAX); BlockingWindow* w = NewJobSetupWindow(jobMsg, printerName); return w->Go();