Skip to content

r.stats: bump up counts storage to unsigned long long #7790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marisn wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −5
Open

r.stats: bump up counts storage to unsigned long long #7790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions raster/r.stats/stats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ struct Node {
struct Node *left;
struct Node *right;
struct Node *list;
long count;
unsigned long long count;
double area;
};

static struct Node **hashtable;
static struct Node *node_list = NULL;
static int node_count = 0;
static long total_count = 0;
static unsigned long long total_count = 0;

int initialize_cell_stats(int n)
{
Expand Down Expand Up @@ -200,7 +200,7 @@ static int node_compare(const void *pp, const void *qq)
static int node_compare_count_asc(const void *pp, const void *qq)
{
struct Node *const *p = pp, *const *q = qq;
long a, b;
unsigned long long a, b;

a = (*p)->count;
b = (*q)->count;
Expand All @@ -213,7 +213,7 @@ static int node_compare_count_asc(const void *pp, const void *qq)
static int node_compare_count_desc(const void *pp, const void *qq)
{
struct Node *const *p = pp, *const *q = qq;
long a, b;
unsigned long long a, b;

a = (*p)->count;
b = (*q)->count;
Expand Down Expand Up @@ -550,7 +550,8 @@ int print_cell_stats(char *fmt, int with_percents, int with_counts,
break;
case CSV:
case PLAIN:
fprintf(stdout, "%s%ld", fs, (long)node->count);
fprintf(stdout, "%s%llu", fs,
(unsigned long long)node->count);
break;
}
}
Expand Down
Loading