wavspa 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016b7487caeb4a42705bb51e79db41769ba020fe43f7aca190c71f08333cda53
-  data.tar.gz: 7fe6ee374e29d9b47c74944959ab4f0cd9a525821a1cb7e55bb1204de025c4f1
+  metadata.gz: 3625b56c19b4e498a53f7315d2439d4c7f4f75c77b46c7d155b35f4e4cc792c4
+  data.tar.gz: c557a8053812bc666cd5d4a9345442ce297d5fb79b7e12aaf0e28af6aecd5a38
 SHA512:
-  metadata.gz: 44df366c15ba55ca2ec19c077d140cf3c1c85caa37d855d43b1c40ebfd515af0f910d1a46776f9d12f7ea99496ffcb1d854b85d8d6a0fc1726c7f63510793aec
-  data.tar.gz: 3e2316a4d6c88748c25ea5e5635ad0f915f1dd716a9e8c701870a9945b3247fd0bdfdb3dceea0fbaac47f87ab669a5c91aa88184f7bfe750a992ddb2fcbd13ed
+  metadata.gz: c26524dacf4725c2032d5e4ce99eef6c24f52a0fc10416918524e7ace1393a53de44905763b51684c8675b7524e66e28a660c2e22669a36ef9b4ce78ed930467
+  data.tar.gz: fe5a7dbdebd6bf3f41a73f9f0076161794304567326592bcc67eabe4bc012f248edede2066ede39b954f7684304a8a99a6ba1d620b7afc567af526e354a633ce

data/ext/wavspa/fb/rb_fb.c

@@ -610,11 +610,14 @@ put_string(rb_fb_t* ptr, int row, int col,
   uint8_t* p0;
   char* str;
   int len;
+  int w;
+  int h;
 
   uint8_t* p;
   const uint8_t* gl; // as Glyph
   int i;
   int j;
+  int k;
   uint8_t m;
 
   head = (uint8_t*)RSTRING_PTR(ptr->buf);
@@ -622,24 +625,32 @@ put_string(rb_fb_t* ptr, int row, int col,
   p0   = head + ((row * ptr->stride) + (col * 3));
   str  = RSTRING_PTR(rstr);
   len  = RSTRING_LEN(rstr);
+  w    = ptr->width + ptr->margin_x;
+  h    = ptr->height + ptr->margin_y;
 
   for (i = 0; i < len; i++) {
     p  = p0 + (i * 6 * 3);
     gl = font + (str[i] * 10);
 
     for (j = 0; j < 10; j++) {
-      for (m = 0x80; m >= 0x08; m >>= 1) {
-        if ((gl[j] & m) && (p + 0 >= head) && (p + 3 < tail)) {
+      for (k = 0; k < 5; k++) {
+        do {
+          if ((col + k <  0) || (row + j <  0)) break;
+          if ((col + k >= w) || (row + j >= h)) break;
+          if (!(gl[j] & (0x80 >> k))) break;
+
           p[0] = r;
           p[1] = g;
           p[2] = b;
-        }
+        } while (0);
 
         p += 3;
       }
 
       p += (ptr->stride - (5 * 3));
     }
+
+    col += 5;
   }
 }
 

data/lib/wavspa/common.rb

@@ -32,7 +32,7 @@ module WavSpectrumAnalyzer
         pos  = fpos(frq)
         break if pos >= @output_width
 
-        fb.hline(pos, "#{frq.to_i}Hz")
+        fb.hline(pos, "#{frq.to_i}Hz") if pos >= 0
         frq = down_step(frq)
       }
      
@@ -44,7 +44,7 @@ module WavSpectrumAnalyzer
         pos = fpos(frq)
         break if pos <= 0 
 
-        fb.hline(pos, "#{frq.to_i}Hz")
+        fb.hline(pos, "#{frq.to_i}Hz") if pos < @output_width
         frq = up_step(frq)
       }
     end

data/lib/wavspa/version.rb

@@ -1,3 +1,3 @@
 module WavSpectrumAnalyzer
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavspa
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler