AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed extra newlines from wxLogDebugs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-05-21 10:31:21 +00:00
parent cb71578cae
commit 48c31b2853
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/generic/dcpsg.cpp
View File

@ -244,7 +244,7 @@ int wxPostScriptDC::GetResolution()
{ {
return (int)(ms_PSScaleFactor * 72.0); return (int)(ms_PSScaleFactor * 72.0);
} }
wxPostScriptDC::wxPostScriptDC () wxPostScriptDC::wxPostScriptDC ()
@ -1564,7 +1564,7 @@ void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const
// Resolution in pixels per logical inch // Resolution in pixels per logical inch
wxSize wxPostScriptDC::GetPPI(void) const wxSize wxPostScriptDC::GetPPI(void) const
{ {
return wxSize((int)(72 * ms_PSScaleFactor), return wxSize((int)(72 * ms_PSScaleFactor),
(int)(72 * ms_PSScaleFactor)); (int)(72 * ms_PSScaleFactor));
} }
@ -1672,16 +1672,16 @@ void wxPostScriptDC::EndDoc ()
wxCoord minY = (wxCoord) YLOG2DEV(m_minY); wxCoord minY = (wxCoord) YLOG2DEV(m_minY);
wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX); wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX);
wxCoord maxY = (wxCoord) YLOG2DEV(m_maxY); wxCoord maxY = (wxCoord) YLOG2DEV(m_maxY);
// LOG2DEV may have changed the minimum to maximum vice versa // LOG2DEV may have changed the minimum to maximum vice versa
if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; } if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; }
if ( minY > maxY ) { wxCoord tmp = minY; minY = maxY; maxY = tmp; } if ( minY > maxY ) { wxCoord tmp = minY; minY = maxY; maxY = tmp; }
// account for used scaling (boundingbox is before scaling in ps-file) // account for used scaling (boundingbox is before scaling in ps-file)
double scale_x = m_printData.GetPrinterScaleX() / ms_PSScaleFactor; double scale_x = m_printData.GetPrinterScaleX() / ms_PSScaleFactor;
double scale_y = m_printData.GetPrinterScaleY() / ms_PSScaleFactor; double scale_y = m_printData.GetPrinterScaleY() / ms_PSScaleFactor;
wxCoord llx, lly, urx, ury; wxCoord llx, lly, urx, ury;
llx = (wxCoord) ((minX+wx_printer_translate_x)*scale_x); llx = (wxCoord) ((minX+wx_printer_translate_x)*scale_x);
lly = (wxCoord) ((minY+wx_printer_translate_y)*scale_y); lly = (wxCoord) ((minY+wx_printer_translate_y)*scale_y);
urx = (wxCoord) ((maxX+wx_printer_translate_x)*scale_x); urx = (wxCoord) ((maxX+wx_printer_translate_x)*scale_x);
@ -1817,7 +1817,7 @@ void wxPostScriptDC::StartPage()
} }
char buffer[100]; char buffer[100];
sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor, sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,
scale_y / ms_PSScaleFactor); scale_y / ms_PSScaleFactor);
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
if (buffer[i] == ',') buffer[i] = '.'; if (buffer[i] == ',') buffer[i] = '.';
@ -2022,7 +2022,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
afmName << name; afmName << name;
FILE *afmFile = wxFopen(afmName,wxT("r")); FILE *afmFile = wxFopen(afmName,wxT("r"));
if (afmFile==NULL) if (afmFile==NULL)
{ {
afmName = wxThePrintSetupData->GetAFMPath(); afmName = wxThePrintSetupData->GetAFMPath();
@ -2052,8 +2052,8 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if (afmFile==NULL) if (afmFile==NULL)
{ {
wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'\n"), afmName.c_str() ); wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'"), afmName.c_str() );
wxLogDebug( wxT(" using approximate values\n")); wxLogDebug( wxT(" using approximate values"));
for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */ for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */
lastDescender = -150; /* dito. */ lastDescender = -150; /* dito. */
} }
@ -2075,7 +2075,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) || if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) ||
(strcmp(descString,"Descender")!=0)) (strcmp(descString,"Descender")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)\n"), afmName.c_str(),line ); wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)"), afmName.c_str(),line );
} }
} }
/* JC 1.) check for UnderlinePosition */ /* JC 1.) check for UnderlinePosition */
@ -2084,7 +2084,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) || if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) ||
(strcmp(upString,"UnderlinePosition")!=0)) (strcmp(upString,"UnderlinePosition")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)\n"), afmName.c_str(), line ); wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)"), afmName.c_str(), line );
} }
} }
/* JC 2.) check for UnderlineThickness */ /* JC 2.) check for UnderlineThickness */
@ -2093,7 +2093,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) || if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) ||
(strcmp(utString,"UnderlineThickness")!=0)) (strcmp(utString,"UnderlineThickness")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)\n"), afmName.c_str(), line ); wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)"), afmName.c_str(), line );
} }
} }
/* JC 3.) check for EncodingScheme */ /* JC 3.) check for EncodingScheme */
@ -2102,11 +2102,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%s",utString,encString)!=2) || if ((sscanf(line,"%s%s",utString,encString)!=2) ||
(strcmp(utString,"EncodingScheme")!=0)) (strcmp(utString,"EncodingScheme")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)\n"), afmName.c_str(), line ); wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)"), afmName.c_str(), line );
} }
else if (strncmp(encString, "AdobeStandardEncoding", 21)) else if (strncmp(encString, "AdobeStandardEncoding", 21))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)\n"), wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)"),
afmName.c_str(),line, encString); afmName.c_str(),line, encString);
} }
} }
@ -2115,11 +2115,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
{ {
if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5) if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5)
{ {
wxLogDebug(wxT("AFM-file '%hs': line '%hs' has an error (bad character width)\n"),afmName.c_str(),line); wxLogDebug(wxT("AFM-file '%hs': line '%hs' has an error (bad character width)"),afmName.c_str(),line);
} }
if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0) if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0)
{ {
wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error\n"),afmName.c_str(),line); wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error"),afmName.c_str(),line);
} }
/* printf(" char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */ /* printf(" char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */
if (ascii>=0 && ascii<256) if (ascii>=0 && ascii<256)
@ -2129,7 +2129,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
else else
{ {
/* MATTHEW: this happens a lot; don't print an error */ /* MATTHEW: this happens a lot; don't print an error */
/* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName.c_str(),ascii); */ /* wxLogDebug("AFM-file '%s': ASCII value %d out of range",afmName.c_str(),ascii); */
} }
} }
/* C.) ignore other entries. */ /* C.) ignore other entries. */
@ -2171,7 +2171,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
{ {
if(lastWidths[*p]== INT_MIN) if(lastWidths[*p]== INT_MIN)
{ {
wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)\n"), *p,*p); wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)"), *p,*p);
sum += lastWidths[' ']; /* assume space */ sum += lastWidths[' ']; /* assume space */
} }
else else
@ -2179,11 +2179,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
sum += lastWidths[*p]; sum += lastWidths[*p];
} }
} }
double widthSum = sum; double widthSum = sum;
widthSum *= Size; widthSum *= Size;
widthSum /= 1000.0F; widthSum /= 1000.0F;
/* add descender to height (it is usually a negative value) */ /* add descender to height (it is usually a negative value) */
//if (lastDescender != INT_MIN) //if (lastDescender != INT_MIN)
//{ //{