Merge branch 'master' of git://github.com/fsphil/dl-fldigi

pull/2/head
James Coxon 2012-03-10 15:33:57 +00:00
commit c8518db908
1 zmienionych plików z 11 dodań i 4 usunięć

Wyświetl plik

@ -20,7 +20,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <math.h>
#include "ssdv.h"
#include "rs8.h"
@ -114,9 +113,17 @@ static const uint8_t std_dht11[179] = {
#define DDQT (s->ddqt[s->component ? 1 : 0][1 + s->acpart])
/* Helpers for converting between DQT tables */
#define AADJ(i) (SDQT == DDQT ? (i) : round((double) i / DDQT))
#define UADJ(i) (SDQT == DDQT ? (i) : round((double) i * SDQT))
#define BADJ(i) (SDQT == DDQT ? (i) : round((double) i * SDQT / DDQT))
#define AADJ(i) (SDQT == DDQT ? (i) : irdiv(i, DDQT))
#define UADJ(i) (SDQT == DDQT ? (i) : (i * SDQT))
#define BADJ(i) (SDQT == DDQT ? (i) : irdiv(i * SDQT, DDQT))
/* Integer-only division with rounding */
static int irdiv(int i, int div)
{
i = i * 2 / div;
if(i & 1) i += (i > 0 ? 1 : -1);
return(i / 2);
}
/*
static char *strbits(uint32_t value, uint8_t bits)