WebSVN – libOLED – Diff – /trunk/src/fontclass.cpp

  */
 #include "libOLED/fontclass.H"
 char font5x7_t::getPixel(char c, int x, int y)
+{
+   // optional scaling
+  if (m_mult != 1 || m_shift != 0)
+  {
+    x = (x * m_mult + m_round/2) >> m_shift;
+    y = (y * m_mult + m_round/2) >> m_shift;
+  }
   if (x < 0 || x >= m_width)
     return 0;
   if (y < 0 || y >= m_height)
     return 0;
   uint8_t pixels = 0;
   return v;
+}
 char font10x18_t::getPixel(char c, int x, int y)
+{
+  // optional scaling
+  if (m_mult != 1 || m_shift != 0)
+  {
+    x = (x * m_mult + m_round) >> m_shift;
+    y = (y * m_mult + m_round) >> m_shift;
+  }
   if (x < 0 || x >= m_width)
     return 0;
   if (y < 0 || y >= m_height)
     return 0;
   if (c < ' ')
     c = ' ';
-  else if (c==0xB0)
+  else if (c == 0xB0)
-    c=128;
+    c = 128;
   else if (c >= m_chars + ' ')
     c = ' ';
   // bit offset into pixel row
   int xm = x + (c - ' ') * m_width;
   // row start address : rounding up
-  int ym = y * (( m_width * m_chars + 7 ) / 8);
+  int ym = y * ((m_width * m_chars + 7) / 8);
-  int index = ym +  xm  / 8;
+  int index = ym + xm / 8;
   return ((m_data[index]) >> (xm & 7)) & 1;
+}
 static const char font5x7_data[] =
+    {
 x08, 0x0c, 0x08, 0x18, 0x08, // ~ 0x7e 126
 x55, 0x2A, 0x55, 0x2A, 0x55, //  0x7F 127
 x00, 0x06, 0x09, 0x06, 0x00, // 0x80 (remapped in code) a degrees sign
-x49, 0x7f, 0x49, 0x49, 0x36, //  0x81 (remapped in code) a sort of Bluetooth symbol
+x49, 0x7f, 0x49, 0x49, 0x36, //  0x81 (remapped in code) a sort of Bluetooth symbol// (1<<2) / 5  sized large font  4/5
 };
-#if defined(USE_OLD_FONT)#else#endif
-font5x7_t small_font(96, font5x7_data);
-font10x18_t large_font(97, font10x18_data);

Subversion Repositories libOLED

(root)/trunk/src/fontclass.cpp – Rev 13 → 17