X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fanalog.c;h=dd23d4b48cf5f5f53fe95575159c871c6c34b3a9;hb=5eff221e8c9a84be71a564441c6edf705f8ba8fa;hp=d2677a576065ab5c9b81fe899a5f828da8dfd891;hpb=7d65dd3a8654ff303c76b917865941e3ae379458;p=libsigrok.git

diff --git a/src/analog.c b/src/analog.c
index d2677a57..dd23d4b4 100644
--- a/src/analog.c
+++ b/src/analog.c
@@ -173,7 +173,8 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
 
 	if (analog->encoding->unitsize == sizeof(float)
 			&& analog->encoding->is_bigendian == bigendian
-			&& (analog->encoding->scale.p == analog->encoding->scale.q)
+			&& analog->encoding->scale.p == 1
+			&& analog->encoding->scale.q == 1
 			&& analog->encoding->offset.p / (float)analog->encoding->offset.q == 0) {
 		/* The data is already in the right format. */
 		memcpy(outbuf, analog->data, count * sizeof(float));
@@ -187,7 +188,8 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
 					((uint8_t *)outbuf)[i + (analog->encoding->unitsize - b)] =
 						((uint8_t *)analog->data)[i * analog->encoding->unitsize + b];
 			}
-			if (analog->encoding->scale.p != analog->encoding->scale.q)
+			if (analog->encoding->scale.p != 1
+					|| analog->encoding->scale.q != 1)
 				outbuf[i] = (outbuf[i] * analog->encoding->scale.p) / analog->encoding->scale.q;
 			offset = ((float)analog->encoding->offset.p / (float)analog->encoding->offset.q);
 			outbuf[i] += offset;
@@ -273,7 +275,7 @@ SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog2 *analog,
  * @param p Numerator
  * @param q Denominator
  */
-SR_API void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q)
+SR_API void sr_rational_set(struct sr_rational *r, int64_t p, uint64_t q)
 {
 	r->p = p;
 	r->q = q;