mirror of
https://abf.rosa.ru/djam/hplip.git
synced 2025-02-24 08:53:02 +00:00
188 lines
7.6 KiB
Diff
188 lines
7.6 KiB
Diff
diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp
|
|
--- hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2012-06-19 11:01:38.000000000 +0200
|
|
+++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp 2012-06-19 11:02:52.150529477 +0200
|
|
@@ -440,7 +440,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
|
|
m_DBusComm.sendEvent(EVENT_PRINT_FAILED_MISSING_PLUGIN, "Plugin missing", m_JA.job_id, m_JA.user_name);
|
|
|
|
}
|
|
- dbglog ("m_Job initialization failed with error = %d", err);
|
|
+ dbglog ("m_Job initialization failed with error = %d\n", err);
|
|
ppdClose(m_ppd);
|
|
m_ppd = NULL;
|
|
return err;
|
|
@@ -533,7 +533,7 @@ int HPCupsFilter::StartPrintJob(int arg
|
|
close(fd);
|
|
}
|
|
if (m_iLogLevel & BASIC_LOG)
|
|
- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err);
|
|
+ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err);
|
|
closeFilter();
|
|
cupsRasterClose(cups_raster);
|
|
return 1;
|
|
@@ -543,7 +543,7 @@ int HPCupsFilter::StartPrintJob(int arg
|
|
close(fd);
|
|
}
|
|
if (m_iLogLevel & BASIC_LOG)
|
|
- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()");
|
|
+ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n");
|
|
closeFilter();
|
|
cupsRasterClose(cups_raster);
|
|
return 0;
|
|
@@ -678,7 +678,7 @@ int HPCupsFilter::processRasterData(cups
|
|
//Need to revisit to crosscheck if it is a firmware issue.
|
|
|
|
*m_pPrinterBuffer = 0x01;
|
|
- dbglog("First raster data plane.." );
|
|
+ dbglog("First raster data plane..\n" );
|
|
}
|
|
|
|
if (this->isBlankRaster((BYTE *) m_pPrinterBuffer, &cups_header)) {
|
|
diff -up hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Lidil.cpp
|
|
--- hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200
|
|
+++ hplip-3.12.6/prnt/hpcups/Lidil.cpp 2012-06-19 11:01:39.598521705 +0200
|
|
@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline *
|
|
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
|
|
m_pPM->BaseResY != m_pQA->vertical_resolution)
|
|
{
|
|
- dbglog("Requested resolution not supported with requested printmode");
|
|
+ dbglog("Requested resolution not supported with requested printmode\n");
|
|
return UNSUPPORTED_PRINTMODE;
|
|
}
|
|
|
|
@@ -166,7 +166,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi
|
|
|
|
if (!selectPrintMode())
|
|
{
|
|
- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name);
|
|
+ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name);
|
|
return UNSUPPORTED_PRINTMODE;
|
|
}
|
|
|
|
@@ -174,7 +174,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi
|
|
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
|
|
m_pPM->BaseResY != m_pQA->vertical_resolution)
|
|
{
|
|
- dbglog("Requested resolution not supported with requested printmode");
|
|
+ dbglog("Requested resolution not supported with requested printmode\n");
|
|
dbglog(" m_pPM->BaseResX = %d\n",m_pPM->BaseResX);
|
|
dbglog(" m_pPM->BaseResY = %d\n",m_pPM->BaseResY);
|
|
dbglog(" m_pQA->horizontal_resolution = %d\n",m_pQA->horizontal_resolution);
|
|
@@ -193,7 +193,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi
|
|
err = allocateSwathBuffers();
|
|
if (err != NO_ERROR)
|
|
{
|
|
- dbglog("allocateSwathBuffers failed, err = %d", err);
|
|
+ dbglog("allocateSwathBuffers failed, err = %d\n", err);
|
|
return err;
|
|
}
|
|
|
|
@@ -625,7 +625,7 @@ bool Lidil::selectPrintMode()
|
|
{
|
|
if (m_pJA->printer_platform[0] == 0)
|
|
{
|
|
- dbglog("printer_platform is undefined");
|
|
+ dbglog("printer_platform is undefined\n");
|
|
return false;
|
|
}
|
|
for (unsigned int i = 0; i < sizeof(lidil_print_modes_table) / sizeof(lidil_print_modes_table[0]); i++)
|
|
@@ -635,7 +635,7 @@ bool Lidil::selectPrintMode()
|
|
return selectPrintMode(i);
|
|
}
|
|
}
|
|
- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform);
|
|
+ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform);
|
|
return false;
|
|
}
|
|
|
|
diff -up hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3.cpp
|
|
--- hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200
|
|
+++ hplip-3.12.6/prnt/hpcups/Pcl3.cpp 2012-06-19 11:01:39.599521691 +0200
|
|
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline **
|
|
|
|
if (!selectPrintMode())
|
|
{
|
|
- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name);
|
|
+ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name);
|
|
return UNSUPPORTED_PRINTMODE;
|
|
}
|
|
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
|
|
m_pPM->BaseResY != m_pQA->vertical_resolution)
|
|
{
|
|
- dbglog("Requested resolution not supported with requested printmode");
|
|
+ dbglog("Requested resolution not supported with requested printmode\n");
|
|
return UNSUPPORTED_PRINTMODE;
|
|
}
|
|
|
|
@@ -220,7 +220,7 @@ void Pcl3::configureRasterData()
|
|
{
|
|
if (m_pPM == NULL)
|
|
{
|
|
- dbglog("configureRasterData: m_pPM is NULL");
|
|
+ dbglog("configureRasterData: m_pPM is NULL\n");
|
|
return;
|
|
}
|
|
BYTE *p = cur_pcl_buffer_ptr;
|
|
@@ -255,7 +255,7 @@ bool Pcl3::selectPrintMode()
|
|
{
|
|
if (m_pJA->printer_platform[0] == 0)
|
|
{
|
|
- dbglog("printer_platform is undefined");
|
|
+ dbglog("printer_platform is undefined\n");
|
|
return false;
|
|
}
|
|
for (unsigned int i = 0; i < sizeof(pcl3_print_modes_table) / sizeof(pcl3_print_modes_table[0]); i++)
|
|
@@ -265,7 +265,7 @@ bool Pcl3::selectPrintMode()
|
|
return selectPrintMode(i);
|
|
}
|
|
}
|
|
- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform);
|
|
+ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform);
|
|
return false;
|
|
}
|
|
|
|
diff -up hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp
|
|
--- hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200
|
|
+++ hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp 2012-06-19 11:01:39.599521691 +0200
|
|
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline
|
|
|
|
if (!selectPrintMode())
|
|
{
|
|
- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name);
|
|
+ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name);
|
|
return UNSUPPORTED_PRINTMODE;
|
|
}
|
|
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
|
|
m_pPM->BaseResY != m_pQA->vertical_resolution)
|
|
{
|
|
- dbglog("Requested resolution not supported with requested printmode");
|
|
+ dbglog("Requested resolution not supported with requested printmode\n");
|
|
return UNSUPPORTED_PRINTMODE;
|
|
}
|
|
|
|
@@ -224,7 +224,7 @@ void Pcl3Gui::configureRasterData()
|
|
{
|
|
if (m_pPM == NULL)
|
|
{
|
|
- dbglog("configureRasterData: m_pPM is NULL");
|
|
+ dbglog("configureRasterData: m_pPM is NULL\n");
|
|
return;
|
|
}
|
|
BYTE *p = cur_pcl_buffer_ptr;
|
|
@@ -259,7 +259,7 @@ bool Pcl3Gui::selectPrintMode()
|
|
{
|
|
if (m_pJA->printer_platform[0] == 0)
|
|
{
|
|
- dbglog("printer_platform is undefined");
|
|
+ dbglog("printer_platform is undefined\n");
|
|
return false;
|
|
}
|
|
for (unsigned int i = 0; i < sizeof(pcl3_gui_print_modes_table) / sizeof(pcl3_gui_print_modes_table[0]); i++)
|
|
@@ -269,7 +269,7 @@ bool Pcl3Gui::selectPrintMode()
|
|
return selectPrintMode(i);
|
|
}
|
|
}
|
|
- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform);
|
|
+ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform);
|
|
return false;
|
|
}
|
|
|